From 9593c7bde06652b5cf976dfc6b4a0204c8531529 Mon Sep 17 00:00:00 2001 From: Roy Crihfield Date: Tue, 23 Apr 2024 18:25:17 +0800 Subject: [PATCH] update tests --- pkg/validator/ref_integrity_test.go | 8 ++++---- pkg/validator/{config_test.go => util_test.go} | 13 +++++++++++++ pkg/validator/validator_test.go | 13 ++++++------- test/compose-db.yml | 2 +- 4 files changed, 24 insertions(+), 12 deletions(-) rename pkg/validator/{config_test.go => util_test.go} (69%) diff --git a/pkg/validator/ref_integrity_test.go b/pkg/validator/ref_integrity_test.go index 6edca05..c1e9b13 100644 --- a/pkg/validator/ref_integrity_test.go +++ b/pkg/validator/ref_integrity_test.go @@ -7,7 +7,6 @@ import ( "testing" helpers "github.com/cerc-io/plugeth-statediff/test_helpers" - "github.com/cerc-io/plugeth-statediff/test_helpers/chaingen" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/rawdb" @@ -16,6 +15,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/cerc-io/ipld-eth-db-validator/v5/internal/chaingen" "github.com/cerc-io/ipld-eth-db-validator/v5/pkg/validator" ) @@ -55,7 +55,7 @@ var _ = Describe("referential integrity", Ordered, func() { }) blocks, receipts, chain = gen.MakeChain(5) - indexer, err := helpers.TestStateDiffIndexer(context.Background(), chainConfig, gen.Genesis.Hash()) + indexer, err := helpers.NewIndexer(context.Background(), chainConfig, gen.Genesis.Hash(), TestDBConfig) Expect(err).ToNot(HaveOccurred()) helpers.IndexChain(indexer, helpers.IndexChainParams{ StateCache: chain.StateCache(), @@ -65,9 +65,9 @@ var _ = Describe("referential integrity", Ordered, func() { }) checkedBlock = blocks[5] - db = helpers.SetupDB() + db = SetupDB() }) - AfterAll(func() { helpers.TearDownDB(db) }) + AfterAll(func() { helpers.ClearDB(db) }) BeforeEach(func() { tx = db.MustBegin() }) AfterEach(func() { diff --git a/pkg/validator/config_test.go b/pkg/validator/util_test.go similarity index 69% rename from pkg/validator/config_test.go rename to pkg/validator/util_test.go index 2688a73..e555474 100644 --- a/pkg/validator/config_test.go +++ b/pkg/validator/util_test.go @@ -1,9 +1,12 @@ package validator_test import ( + "context" "math/big" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql/postgres" "github.com/ethereum/go-ethereum/params" + "github.com/jmoiron/sqlx" ) var TestChainConfig = ¶ms.ChainConfig{ @@ -23,3 +26,13 @@ var TestChainConfig = ¶ms.ChainConfig{ GrayGlacierBlock: big.NewInt(0), Ethash: new(params.EthashConfig), } + +var TestDBConfig, _ = postgres.TestConfig.WithEnv() + +func SetupDB() *sqlx.DB { + db, err := postgres.ConnectSQLX(context.Background(), TestDBConfig) + if err != nil { + panic(err) + } + return db +} diff --git a/pkg/validator/validator_test.go b/pkg/validator/validator_test.go index 6a6cb37..0d6cd26 100644 --- a/pkg/validator/validator_test.go +++ b/pkg/validator/validator_test.go @@ -7,7 +7,6 @@ import ( "github.com/cerc-io/plugeth-statediff/indexer/ipld" helpers "github.com/cerc-io/plugeth-statediff/test_helpers" - "github.com/cerc-io/plugeth-statediff/test_helpers/chaingen" sdtypes "github.com/cerc-io/plugeth-statediff/types" "github.com/ethereum/go-ethereum/core/rawdb" "github.com/ethereum/go-ethereum/log" @@ -16,6 +15,7 @@ import ( // import server helpers for non-canonical chain data server_mocks "github.com/cerc-io/ipld-eth-server/v5/pkg/eth/test_helpers" + "github.com/cerc-io/ipld-eth-db-validator/v5/internal/chaingen" "github.com/cerc-io/ipld-eth-db-validator/v5/pkg/validator" ) @@ -32,7 +32,7 @@ var ( func init() { // The geth sync logs are noisy, silence them - log.Root().SetHandler(log.DiscardHandler()) + log.SetDefault(log.NewLogger(log.DiscardHandler())) } func setupStateValidator(t *testing.T) *sqlx.DB { @@ -44,7 +44,7 @@ func setupStateValidator(t *testing.T) *sqlx.DB { chain.Stop() }) - indexer, err := helpers.TestStateDiffIndexer(context.Background(), chainConfig, gen.Genesis.Hash()) + indexer, err := helpers.NewIndexer(context.Background(), chainConfig, gen.Genesis.Hash(), TestDBConfig) if err != nil { t.Fatal(err) } @@ -96,10 +96,9 @@ func setupStateValidator(t *testing.T) *sqlx.DB { t.Fatal(err) } - db := helpers.SetupDB() - + db := SetupDB() t.Cleanup(func() { - helpers.TearDownDB(db) + helpers.ClearDB(db) }) return db } @@ -119,7 +118,7 @@ func TestStateValidation(t *testing.T) { t.Fatal(err) } if blockToBeValidated == nil { - t.Fatal("blockToBeValidated is nil") + t.Fatal("block was not found") } err = validator.ValidateBlock(blockToBeValidated, api.B, i) diff --git a/test/compose-db.yml b/test/compose-db.yml index 15c7422..8e10a35 100644 --- a/test/compose-db.yml +++ b/test/compose-db.yml @@ -5,7 +5,7 @@ services: restart: on-failure depends_on: - ipld-eth-db - image: git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:v5.0.5-alpha + image: git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:v5.2.1-alpha environment: DATABASE_USER: "vdbm" DATABASE_NAME: "cerc_testing"