From d974aad0d548afd92c0cfb278a9d2526cd11f883 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Fri, 20 Apr 2018 10:25:06 -0400
Subject: [PATCH] before pull

---
 blockExplorerApi/handler.go | 92 ++++++++++++++-----------------------
 blockExplorerApi/routes.go  | 20 ++++----
 2 files changed, 44 insertions(+), 68 deletions(-)

diff --git a/blockExplorerApi/handler.go b/blockExplorerApi/handler.go
index ac0b82b000..cdf4a66864 100644
--- a/blockExplorerApi/handler.go
+++ b/blockExplorerApi/handler.go
@@ -2,84 +2,71 @@ package main
 
 ///@NOTE Shyft handler functions when endpoints are hit
 import (
-	"encoding/json"
 	"fmt"
 	logger "log"
 	"net/http"
 
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/shyftdb"
+	shyftdb "github.com/ethereum/go-ethereum/shyftdb"
 	"github.com/gorilla/mux"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/util"
 )
 
-// GetAllTransactions gets txs
-func GetAllTransactions(w http.ResponseWriter, r *http.Request) {
-	db, err := leveldb.OpenFile(`../shyftData/geth/blockExplorerDb/`, nil)
-	if err != nil {
-		return
-	}
-	var data []byte
-	iter := db.NewIterator(util.BytesPrefix([]byte("tx-")), nil)
-	for iter.Next() {
+// GetTransaction gets txs
+func GetTransaction(w http.ResponseWriter, r *http.Request) {
+	// vars := mux.Vars(r)
+	// address := vars["address"]
 
-		logger.Printf("%s\t%s", "\nALL TX VALUE: ", string(iter.Value()))
-		data = append(iter.Value())
-	}
-
-	logger.Print("outside loop", data)
-	iter.Release()
+	//tx := shyftdb.GetTransaction()
 	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
 	w.WriteHeader(http.StatusOK)
 
-	json.NewEncoder(w).Encode(data)
+	//fmt.Fprintln(w, "Get All Transactions", addresses)
+}
+
+// GetAllTransactions gets txs
+func GetAllTransactions(w http.ResponseWriter, r *http.Request) {
+	//txs := shyftdb.GetAllTransactions()
+
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
+
+	//fmt.Fprintln(w, "Get All Transactions", address)
 }
 
 // GetBalance gets balance
 func GetBalance(w http.ResponseWriter, r *http.Request) {
 	// vars := mux.Vars(r)
 	// address := vars["address"]
-	address := "0x43ec6d0942f7faef069f7f63d0384a27f529b062"
-	addressBytes := []byte(address)
-
-	db, err := leveldb.OpenFile(`../shyftData/geth/blockExplorerDb/`, nil)
-	if err != nil {
-		return
-	}
-
-	// if err := db.Put(addressBytes, []byte("Golang BABY WOOOOOOOOO! BARBADOS"), nil); err != nil {
-	// 	log.Crit("Failed to store TX", "err", err)
-	// }
-
-	data, err := db.Get(addressBytes, nil)
-	if err != nil {
-		log.Crit("Could not retrieve block", "err", err)
-	}
-
-	bodyString := string(data)
+	//addressBytes := []byte(address)
 
 	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
 	w.WriteHeader(http.StatusOK)
 
-	json.NewEncoder(w).Encode(bodyString)
+	//fmt.Fprintln(w, "Get Balances", addresses)
 }
 
 // GetBalances gets balances
 func GetBalances(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	addresses := vars["addresses"]
 
 	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
 	w.WriteHeader(http.StatusOK)
 
-	fmt.Fprintln(w, "Get Balances", addresses)
+	//fmt.Fprintln(w, "Get Balances", addresses)
 }
 
-// GetBlocksMined get blocks mined
-func GetBlocksMined(w http.ResponseWriter, r *http.Request) {
-	logger.Print("Check logs")
+//GetBlock returns block json
+func GetBlock(w http.ResponseWriter, r *http.Request) {
+	//block := shyftdb.GetBlock()
+
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
+
+	//fmt.Fprintln(w, "block", block)
+}
+
+// GetAllBlocks response
+func GetAllBlocks(w http.ResponseWriter, r *http.Request) {
 	blockExplorerDb, err := leveldb.OpenFile("./shyftData/geth/blockExplorerDb/", &opt.Options{
 		ErrorIfMissing: true,
 		ReadOnly:       true,
@@ -93,18 +80,7 @@ func GetBlocksMined(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
 	w.WriteHeader(http.StatusOK)
 
-	fmt.Fprintln(w, "Get Blocks Mined", blocks)
-}
-
-// GetTransactions gets txs
-func GetTransactions(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	address := vars["address"]
-
-	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
-	w.WriteHeader(http.StatusOK)
-
-	fmt.Fprintln(w, "Get Transactions", address)
+	fmt.Fprintln(w, "blocks", blocks)
 }
 
 //GetInternalTransactions gets internal txs
@@ -115,7 +91,7 @@ func GetInternalTransactions(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
 	w.WriteHeader(http.StatusOK)
 
-	fmt.Fprintln(w, "GetInternalTransactions", address)
+	fmt.Fprintln(w, "Get InternalTransactions", address)
 }
 
 //GetInternalTransactionsHash gets internal txs hash
diff --git a/blockExplorerApi/routes.go b/blockExplorerApi/routes.go
index a2e6a8be8b..7aedd4f691 100644
--- a/blockExplorerApi/routes.go
+++ b/blockExplorerApi/routes.go
@@ -28,23 +28,23 @@ var routes = Routes{
 		GetBalances,
 	},
 	Route{
-		"GetBlocksMined",
+		"GetAllBlocks",
 		"GET",
-		"/api/get_blocks_mined",
-		GetBlocksMined,
-	},
-	Route{
-		"GetTransactions",
-		"GET",
-		"/api/get_transactions/{address}",
-		GetTransactions,
+		"/api/get_all_blocks",
+		GetAllBlocks,
 	},
 	Route{
 		"GetAllTransactions",
 		"GET",
-		"/api/get_all_transactions/",
+		"/api/get_all_transactions",
 		GetAllTransactions,
 	},
+	Route{
+		"GetTransaction",
+		"GET",
+		"/api/get_transaction/{address}",
+		GetTransaction,
+	},
 	Route{
 		"GetInternalTransactions",
 		"GET",