From 68a0c09657e317d0294dcc29ec7d011a6435a2ec Mon Sep 17 00:00:00 2001
From: Abdul Rabbani <abdulrabbani00@gmail.com>
Date: Wed, 30 Mar 2022 17:30:19 -0400
Subject: [PATCH] Code Clean Up

---
 related-repositories/README.md                |  4 +++
 .../database/sql/indexer_shared_test.go       | 25 -------------------
 .../sql/mainnet_tests/indexer_test.go         |  7 +-----
 statediff/service.go                          |  2 --
 4 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/related-repositories/README.md b/related-repositories/README.md
index 28121ee48..14ac389a6 100644
--- a/related-repositories/README.md
+++ b/related-repositories/README.md
@@ -14,3 +14,7 @@ It is recommended that you move the following repositories under this folder. Ke
 ## Symlinks
 
 You can also create symlinks in this folder with the location of your repositories.
+
+# Dependencies
+
+If you want to use `foundry-test`, you will need to utilize the recommended setup.
diff --git a/statediff/indexer/database/sql/indexer_shared_test.go b/statediff/indexer/database/sql/indexer_shared_test.go
index ef08ad2d3..acb5fd71e 100644
--- a/statediff/indexer/database/sql/indexer_shared_test.go
+++ b/statediff/indexer/database/sql/indexer_shared_test.go
@@ -2,23 +2,18 @@ package sql_test
 
 import (
 	"bytes"
-	"context"
-	"errors"
 	"fmt"
 	"os"
 	"testing"
 
 	"github.com/ipfs/go-cid"
-	"github.com/jmoiron/sqlx"
 	"github.com/multiformats/go-multihash"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/statediff/indexer/database/file"
 	"github.com/ethereum/go-ethereum/statediff/indexer/database/sql"
-	"github.com/ethereum/go-ethereum/statediff/indexer/database/sql/postgres"
 	"github.com/ethereum/go-ethereum/statediff/indexer/interfaces"
 	"github.com/ethereum/go-ethereum/statediff/indexer/ipld"
 	"github.com/ethereum/go-ethereum/statediff/indexer/mocks"
@@ -26,7 +21,6 @@ import (
 
 var (
 	db        sql.Database
-	sqlxdb    *sqlx.DB
 	err       error
 	ind       interfaces.StateDiffIndexer
 	chainConf = params.MainnetChainConfig
@@ -173,25 +167,6 @@ func checkTxClosure(t *testing.T, idle, inUse, open int64) {
 	require.Equal(t, open, db.Stats().Open())
 }
 
-func setupDb(t *testing.T) (*sql.StateDiffIndexer, error) {
-	db, err = postgres.SetupSQLXDB()
-	if err != nil {
-		t.Fatal(err)
-	}
-	stateDiff, err := sql.NewStateDiffIndexer(context.Background(), chainConf, db)
-	return stateDiff, err
-}
-
-func setupFile(t *testing.T) interfaces.StateDiffIndexer {
-	if _, err := os.Stat(file.TestConfig.FilePath); !errors.Is(err, os.ErrNotExist) {
-		err := os.Remove(file.TestConfig.FilePath)
-		require.NoError(t, err)
-	}
-	ind, err = file.NewStateDiffIndexer(context.Background(), mocks.TestConfig, file.TestConfig)
-	require.NoError(t, err)
-	return ind
-}
-
 func tearDown(t *testing.T) {
 	sql.TearDownDB(t, db)
 	err := ind.Close()
diff --git a/statediff/indexer/database/sql/mainnet_tests/indexer_test.go b/statediff/indexer/database/sql/mainnet_tests/indexer_test.go
index 213daa54c..55f535aa8 100644
--- a/statediff/indexer/database/sql/mainnet_tests/indexer_test.go
+++ b/statediff/indexer/database/sql/mainnet_tests/indexer_test.go
@@ -75,17 +75,12 @@ func testPushBlockAndState(t *testing.T, block *types.Block, receipts types.Rece
 	})
 }
 
-func setupDb(t *testing.T) (interfaces.StateDiffIndexer, error) {
+func setup(t *testing.T, testBlock *types.Block, testReceipts types.Receipts) {
 	db, err = postgres.SetupSQLXDB()
 	if err != nil {
 		t.Fatal(err)
 	}
 	ind, err = sql.NewStateDiffIndexer(context.Background(), chainConf, db)
-	return ind, err
-}
-
-func setup(t *testing.T, testBlock *types.Block, testReceipts types.Receipts) (interfaces.StateDiffIndexer, interfaces.Batch) {
-	ind, err = setupDb(t)
 	require.NoError(t, err)
 	var tx interfaces.Batch
 	tx, err = ind.PushBlock(
diff --git a/statediff/service.go b/statediff/service.go
index 8f926be6d..729c9503a 100644
--- a/statediff/service.go
+++ b/statediff/service.go
@@ -147,8 +147,6 @@ type Service struct {
 	maxRetry uint
 }
 
-// This structure keeps track of the knownGaps at any given moment in time
-
 // BlockCache caches the last block for safe access from different service loops
 type BlockCache struct {
 	sync.Mutex