From d66dbedb0f1f87f7a022a42529037a7825dd8407 Mon Sep 17 00:00:00 2001 From: Ceyhun Onur Date: Thu, 18 Apr 2024 12:24:52 +0300 Subject: [PATCH 1/4] remove ancients from test --- core/blockchain_snapshot_test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/blockchain_snapshot_test.go b/core/blockchain_snapshot_test.go index 9b5cea4aa1..8ba2f5a26a 100644 --- a/core/blockchain_snapshot_test.go +++ b/core/blockchain_snapshot_test.go @@ -34,7 +34,6 @@ import ( "fmt" "math/big" "os" - "path" "strings" "testing" @@ -72,7 +71,6 @@ type snapshotTestBasic struct { func (basic *snapshotTestBasic) prepare(t *testing.T) (*BlockChain, []*types.Block) { // Create a temporary persistent database datadir := t.TempDir() - ancient := path.Join(datadir, "ancient") db, err := rawdb.Open(rawdb.OpenOptions{ Directory: datadir, @@ -130,7 +128,6 @@ func (basic *snapshotTestBasic) prepare(t *testing.T) (*BlockChain, []*types.Blo // Set runtime fields basic.datadir = datadir - basic.ancient = ancient basic.db = db basic.genDb = genDb basic.engine = engine @@ -212,7 +209,6 @@ func (basic *snapshotTestBasic) teardown() { basic.db.Close() basic.genDb.Close() os.RemoveAll(basic.datadir) - os.RemoveAll(basic.ancient) } // snapshotTest is a test case type for normal snapshot recovery. From 29efc8831e0f2bf3cb4c4b2c09921192edf96ece Mon Sep 17 00:00:00 2001 From: Ceyhun Onur Date: Thu, 18 Apr 2024 12:27:27 +0300 Subject: [PATCH 2/4] use require instance --- core/blockchain_test.go | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/core/blockchain_test.go b/core/blockchain_test.go index d798d6350e..71ef0cf84a 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -539,6 +539,7 @@ func TestUngracefulAsyncShutdown(t *testing.T) { func TestTransactionIndices(t *testing.T) { // Configure and generate a sample block chain + require := require.New(t) var ( key1, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") key2, _ = crypto.HexToECDSA("8a1f9a8f95be41cd7ccb6168179afb4504aefe388d1e14474d32c45c72ce7b7a") @@ -553,17 +554,17 @@ func TestTransactionIndices(t *testing.T) { ) genDb, blocks, _, err := GenerateChainWithGenesis(gspec, dummy.NewFaker(), 128, 10, func(i int, block *BlockGen) { tx, err := types.SignTx(types.NewTransaction(block.TxNonce(addr1), addr2, big.NewInt(10000), params.TxGas, nil, nil), signer, key1) - require.NoError(t, err) + require.NoError(err) block.AddTx(tx) }) - require.NoError(t, err) + require.NoError(err) blocks2, _, err := GenerateChain(gspec.Config, blocks[len(blocks)-1], dummy.NewFaker(), genDb, 10, 10, func(i int, block *BlockGen) { tx, err := types.SignTx(types.NewTransaction(block.TxNonce(addr1), addr2, big.NewInt(10000), params.TxGas, nil, nil), signer, key1) - require.NoError(t, err) + require.NoError(err) block.AddTx(tx) }) - require.NoError(t, err) + require.NoError(err) conf := &CacheConfig{ TrieCleanLimit: 256, @@ -580,19 +581,19 @@ func TestTransactionIndices(t *testing.T) { // Init block chain and check all needed indices has been indexed. chainDB := rawdb.NewMemoryDatabase() chain, err := createBlockChain(chainDB, conf, gspec, common.Hash{}) - require.NoError(t, err) + require.NoError(err) _, err = chain.InsertChain(blocks) - require.NoError(t, err) + require.NoError(err) for _, block := range blocks { err := chain.Accept(block) - require.NoError(t, err) + require.NoError(err) } chain.DrainAcceptorQueue() lastAcceptedBlock := blocks[len(blocks)-1] - require.Equal(t, lastAcceptedBlock.Hash(), chain.CurrentHeader().Hash()) + require.Equal(lastAcceptedBlock.Hash(), chain.CurrentHeader().Hash()) CheckTxIndices(t, nil, lastAcceptedBlock.NumberU64(), chain.db, false) // check all indices has been indexed chain.Stop() @@ -611,7 +612,7 @@ func TestTransactionIndices(t *testing.T) { conf.TxLookupLimit = l chain, err := createBlockChain(chainDB, conf, gspec, lastAcceptedBlock.Hash()) - require.NoError(t, err) + require.NoError(err) tail := getTail(l, lastAcceptedBlock.NumberU64()) // check if startup indices are correct @@ -619,11 +620,11 @@ func TestTransactionIndices(t *testing.T) { newBlks := blocks2[i : i+1] _, err = chain.InsertChain(newBlks) // Feed chain a higher block to trigger indices updater. - require.NoError(t, err) + require.NoError(err) lastAcceptedBlock = newBlks[0] err = chain.Accept(lastAcceptedBlock) // Accept the block to trigger indices updater. - require.NoError(t, err) + require.NoError(err) chain.DrainAcceptorQueue() tail = getTail(l, lastAcceptedBlock.NumberU64()) From 4a1740069c0456a34317bba408e707c592d4883e Mon Sep 17 00:00:00 2001 From: Ceyhun Onur Date: Thu, 18 Apr 2024 22:41:29 +0300 Subject: [PATCH 3/4] enable local txs for tmpnet --- tests/utils/tmpnet.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/utils/tmpnet.go b/tests/utils/tmpnet.go index 5c5258e366..d7c17d1c95 100644 --- a/tests/utils/tmpnet.go +++ b/tests/utils/tmpnet.go @@ -15,8 +15,9 @@ import ( ) var DefaultChainConfig = tmpnet.FlagsMap{ - "log-level": "debug", - "warp-api-enabled": true, + "log-level": "debug", + "warp-api-enabled": true, + "local-txs-enabled": true, } func NewTmpnetNodes(count int) []*tmpnet.Node { From 60ada8d0ba658437495877ca6699f15617d5f55f Mon Sep 17 00:00:00 2001 From: Ceyhun Onur Date: Fri, 19 Apr 2024 16:58:56 +0300 Subject: [PATCH 4/4] remove ancient field --- core/blockchain_snapshot_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/core/blockchain_snapshot_test.go b/core/blockchain_snapshot_test.go index 8ba2f5a26a..ac1d529ed5 100644 --- a/core/blockchain_snapshot_test.go +++ b/core/blockchain_snapshot_test.go @@ -59,7 +59,6 @@ type snapshotTestBasic struct { // share fields, set in runtime datadir string - ancient string db ethdb.Database genDb ethdb.Database engine consensus.Engine