resolving conflicts

core/shyft_database_util.go

@@ -8,7 +8,6 @@ import (
 	"database/sql"
 	"log"
 	_ "github.com/lib/pq"
-	"fmt"
 	"github.com/ShyftNetwork/go-empyrean/common"
 	"github.com/ShyftNetwork/go-empyrean/core/types"
 	Rewards "github.com/ShyftNetwork/go-empyrean/consensus/ethash"
@@ -300,11 +299,9 @@ func swriteBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndReceive,
 		Amount: tx.Value().String(),
 	}
 
-	fmt.Println("TO", sendAndReceiveData.To)
-	fmt.Println("FROM", sendAndReceiveData.From)
 	getAccountBalanceReceiver := SGetAccount(sqldb, sendAndReceiveData.To)
 	getAccountBalanceSender:= SGetAccount(sqldb, sendAndReceiveData.From)
-	fmt.Println("HERE", getAccountBalanceReceiver)
+
 	var receiverData SendAndReceive
 	if err := json.Unmarshal([]byte(getAccountBalanceReceiver), &receiverData); err != nil {
 		log.Fatal(err)

core/shyft_get_utils.go

@@ -280,20 +280,25 @@ func SGetTransaction(sqldb *sql.DB, txHash string) string {
 	return string(json)
 }
 
+func InnerSGetAccount(sqldb *sql.DB, address string) (SAccounts, bool) {
+	sqlStatement := `SELECT * FROM accounts WHERE addr=$1;`
+	var addr, balance, accountNonce string
+	err := sqldb.QueryRow(sqlStatement, address).Scan(&addr, &balance, &accountNonce)
+	if err == sql.ErrNoRows {
+		return SAccounts{}, false
+	} else {
+		account := SAccounts{
+			Addr:    		addr,
+			Balance: 		balance,
+			AccountNonce: 	accountNonce,
+		}
+		return account, true
+	}
+}
+
 //GetAccount returns account balances
 func SGetAccount(sqldb *sql.DB, address string) string {
-	sqlStatement := `SELECT * FROM accounts WHERE addr=$1;`
+	var account, _ = InnerSGetAccount(sqldb, address)
-	row := sqldb.QueryRow(sqlStatement, address)
-	var addr, balance, accountNonce string
-
-	row.Scan(
-		&addr, &balance, &accountNonce)
-
-	account := SAccounts{
-		Addr:    		addr,
-		Balance: 		balance,
-		AccountNonce: 	accountNonce,
-	}
 	json, _ := json.Marshal(account)
 	return string(json)
 }

shyftDb/shyft_database_util_test.go

@@ -479,7 +479,7 @@ t.Run("TestAccountsToReturnAccounts",func(t *testing.T) {
 	toBalance := new(big.Int)
 	toBalance, l := toBalance.SetString(accountAddrTo.Balance, 10)
 	fmt.Println(l)
-	
+
 	if toBalance.Cmp(addedAmount) != 0 {
 		t.Fatalf("To address balance [%v]: To address balance not correct FFO", toBalance)
 	}