From a60d5a016d1b3953eae6f3a31e107547f5e0284c Mon Sep 17 00:00:00 2001 From: Abdul Rabbani 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 | 8 +----- statediff/known_gaps_test.go | 5 +--- statediff/service.go | 2 -- 5 files changed, 6 insertions(+), 38 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 1d11a5f8e..feb492d62 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 @@ -156,25 +150,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 5c30b0d6a..158009ac9 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( @@ -105,7 +100,6 @@ func setup(t *testing.T, testBlock *types.Block, testReceipts types.Receipts) (i } test_helpers.ExpectEqual(t, tx.(*sql.BatchTx).BlockNumber, testBlock.Number().Uint64()) - return ind, tx } func tearDown(t *testing.T) { diff --git a/statediff/known_gaps_test.go b/statediff/known_gaps_test.go index b1d951add..6506a0f0d 100644 --- a/statediff/known_gaps_test.go +++ b/statediff/known_gaps_test.go @@ -8,14 +8,12 @@ import ( "testing" "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" "github.com/ethereum/go-ethereum/statediff/indexer/database/sql/postgres" "github.com/stretchr/testify/require" ) var ( - chainConf = params.MainnetChainConfig knownGapsFilePath = "./known_gaps.sql" ) @@ -46,7 +44,7 @@ func TestKnownGaps(t *testing.T) { testWriteToDb(t, tests, true) testWriteToFile(t, tests, true) - //testFindAndUpdateGaps(t, true) + testFindAndUpdateGaps(t, true) } // test writing blocks to the DB @@ -204,7 +202,6 @@ func setupDb(t *testing.T) sql.Database { t.Error("Can't create a DB connection....") t.Fatal(err) } - // stateDiff, err := sql.NewStateDiffIndexer(context.Background(), chainConf, db) return db } diff --git a/statediff/service.go b/statediff/service.go index 3e3cbb9b3..960f776f8 100644 --- a/statediff/service.go +++ b/statediff/service.go @@ -139,8 +139,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