From de13a538f6836b92ff63dc226ad0ad30ad579440 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 8 Aug 2018 17:59:26 -0400
Subject: [PATCH] resolved conflicts

---
 core/shyft_database_util.go | 85 -------------------------------------
 1 file changed, 85 deletions(-)

diff --git a/core/shyft_database_util.go b/core/shyft_database_util.go
index 87750e46e6..3e955d5f97 100644
--- a/core/shyft_database_util.go
+++ b/core/shyft_database_util.go
@@ -25,91 +25,6 @@ func SetIShyftTracer(st shyfttracerinterface.IShyftTracer) {
 	IShyftTracer = st
 }
 
-// //SBlock type
-// type SBlock struct {
-// 	Hash       string
-// 	Coinbase   string
-// 	AgeGet     string
-// 	Age        time.Time
-// 	ParentHash string
-// 	UncleHash  string
-// 	Difficulty string
-// 	Size       string
-// 	Rewards    string
-// 	Number     string
-// 	GasUsed    uint64
-// 	GasLimit   uint64
-// 	Nonce      uint64
-// 	TxCount    int
-// 	UncleCount int
-// 	Blocks     []SBlock
-// }
-
-// type InteralWrite struct {
-// 	Hash    string
-// 	Type    string
-// 	From    string
-// 	To      string
-// 	Value   string
-// 	Gas     uint64
-// 	GasUsed uint64
-// 	Input   string
-// 	Output  string
-// 	Time    string
-// }
-
-// //blockRes struct
-// // type blockRes struct {
-// // 	hash     string
-// // 	coinbase string
-// // 	number   string
-// // 	Blocks   []SBlock
-// // }
-
-// type SAccounts struct {
-// 	Addr         string
-// 	Balance      string
-// 	AccountNonce string
-// }
-
-// type accountRes struct {
-// 	addr        string
-// 	balance     string
-// 	AllAccounts []SAccounts
-// }
-
-// type txRes struct {
-// 	TxEntry []ShyftTxEntryPretty
-// }
-
-// type ShyftTxEntryPretty struct {
-// 	TxHash      string
-// 	To          *common.Address
-// 	ToGet       string
-// 	From        string
-// 	BlockHash   string
-// 	BlockNumber string
-// 	Amount      string
-// 	GasPrice    uint64
-// 	Gas         uint64
-// 	GasLimit    uint64
-// 	Cost        uint64
-// 	Nonce       uint64
-// 	Status      string
-// 	IsContract  bool
-// 	Age         time.Time
-// 	Data        []byte
-// }
-
-// type SendAndReceive struct {
-// 	To           string
-// 	From         string
-// 	Amount       string
-// 	Address      string
-// 	Balance      string
-// 	AccountNonce uint64 `json:",string"`
-// }
-
 //SWriteBlock writes to block info to sql db
 func SWriteBlock(block *types.Block, receipts []*types.Receipt) error {
 	sqldb, err := DBConnection()