fix: testcases

kaleido-io · Aug 13, 2024 · 5cda3fe · 5cda3fe
1 parent e6132fd
commit 5cda3fe
Show file tree

Hide file tree

Showing 8 changed files with 282 additions and 278 deletions.
diff --git a/accounts/abi/bind/backends/simulated_test.go b/accounts/abi/bind/backends/simulated_test.go
@@ -158,7 +158,7 @@ func TestNewSimulatedBackend(t *testing.T) {
 func TestAdjustTime(t *testing.T) {
 	t.Parallel()
 	sim := NewSimulatedBackend(
-		core.GenesisAlloc{}, 10000000,
+		types.GenesisAlloc{}, 10000000,
 	)
 	defer sim.Close()
 

diff --git a/common/leak/ignore_list.go b/common/leak/ignore_list.go
@@ -15,10 +15,11 @@ func IgnoreList() []goleak.Option {
 		// todo: this leaks should be fixed
 		goleak.IgnoreTopFunction("github.com/ethereum/go-ethereum/accounts/abi/bind/backends.nullSubscription.func1"),
 		goleak.IgnoreTopFunction("github.com/ethereum/go-ethereum/accounts/abi/bind/backends.(*filterBackend).SubscribeNewTxsEvent.func1"),
-		goleak.IgnoreTopFunction("github.com/ethereum/go-ethereum/accounts/abi/bind/backends.(*filterBackend).SubscribePendingLogsEvent.func1"),
+		goleak.IgnoreTopFunction("github.com/ethereum/go-ethereum/accounts/abi/bind/backends.(*filterBackend).SubscribePendingLogsEvent.nullSubscription.func1"),
 		goleak.IgnoreTopFunction("github.com/ethereum/go-ethereum/consensus/ethash.(*remoteSealer).loop"),
 		goleak.IgnoreTopFunction("github.com/ethereum/go-ethereum/core.(*BlockChain).updateFutureBlocks"),
 		goleak.IgnoreTopFunction("github.com/ethereum/go-ethereum/core/state/snapshot.(*diskLayer).generate"),
+		goleak.IgnoreTopFunction("github.com/ethereum/go-ethereum/core/state.(*subfetcher).loop"),
 		goleak.IgnoreTopFunction("github.com/ethereum/go-ethereum/eth/filters.(*EventSystem).eventLoop"),
 		goleak.IgnoreTopFunction("github.com/ethereum/go-ethereum/event.NewSubscription.func1"),
 		goleak.IgnoreTopFunction("github.com/ethereum/go-ethereum/event.NewSubscription"),

diff --git a/core/blockchain.go b/core/blockchain.go
@@ -324,20 +324,22 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, genesis *Genesis
 	log.Info("")
 
 	bc := &BlockChain{
-		chainConfig:      chainConfig,
-		cacheConfig:      cacheConfig,
-		db:               db,
-		triedb:           triedb,
-		triegc:           prque.New[int64, common.Hash](nil),
-		quit:             make(chan struct{}),
-		chainmu:          syncx.NewClosableMutex(),
-		bodyCache:        lru.NewCache[common.Hash, *types.Body](bodyCacheLimit),
-		bodyRLPCache:     lru.NewCache[common.Hash, rlp.RawValue](bodyCacheLimit),
-		receiptsCache:    lru.NewCache[common.Hash, []*types.Receipt](receiptsCacheLimit),
-		blockCache:       lru.NewCache[common.Hash, *types.Block](blockCacheLimit),
-		txLookupCache:    lru.NewCache[common.Hash, txLookup](txLookupCacheLimit),
-		engine:           engine,
-		vmConfig:         vmConfig,
+		chainConfig:   chainConfig,
+		cacheConfig:   cacheConfig,
+		db:            db,
+		triedb:        triedb,
+		triegc:        prque.New[int64, common.Hash](nil),
+		quit:          make(chan struct{}),
+		chainmu:       syncx.NewClosableMutex(),
+		bodyCache:     lru.NewCache[common.Hash, *types.Body](bodyCacheLimit),
+		bodyRLPCache:  lru.NewCache[common.Hash, rlp.RawValue](bodyCacheLimit),
+		receiptsCache: lru.NewCache[common.Hash, []*types.Receipt](receiptsCacheLimit),
+		blockCache:    lru.NewCache[common.Hash, *types.Block](blockCacheLimit),
+		txLookupCache: lru.NewCache[common.Hash, txLookup](txLookupCacheLimit),
+		futureBlocks:  lru.NewCache[common.Hash, *types.Block](maxFutureBlocks),
+		engine:        engine,
+		vmConfig:      vmConfig,
+
 		borReceiptsCache: lru.NewCache[common.Hash, *types.Receipt](receiptsCacheLimit),
 		logger:           vmConfig.Tracer,
 	}
@@ -533,11 +535,12 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, genesis *Genesis
 		rawdb.WriteChainConfig(db, genesisHash, chainConfig)
 	}
 
-	// Start tx indexer if it's enabled.
-	if txLookupLimit != nil {
-		bc.txIndexer = newTxIndexer(*txLookupLimit, bc)
+	if txLookupLimit == nil {
+		txLookupLimit = new(uint64)
 	}
 
+	bc.txIndexer = newTxIndexer(*txLookupLimit, bc)
+
 	return bc, nil
 }
 

diff --git a/eth/downloader/bor_downloader_test.go b/eth/downloader/bor_downloader_test.go
@@ -777,7 +777,7 @@ func testMultiProtoSync(t *testing.T, protocol uint, mode SyncMode) {
 	assertOwnChain(t, tester, len(chain.blocks))
 
 	// Check that no peers have been dropped off
-	for _, version := range []int{68, 67} {
+	for _, version := range []int{68} {
 		peer := fmt.Sprintf("peer %d", version)
 		if _, ok := tester.peers[peer]; !ok {
 			t.Errorf("%s dropped", peer)

diff --git a/eth/gasprice/gasprice_test.go b/eth/gasprice/gasprice_test.go
@@ -166,8 +166,8 @@ func newTestBackend(t *testing.T, londonBlock *big.Int, cancunBlock *big.Int, pe
 
 	if cancunBlock != nil {
 		// ts := gspec.Timestamp + cancunBlock.Uint64()*10 // fixed 10 sec block time in blockgen
-		config.ShanghaiBlock = big.NewInt(10)
-		config.CancunBlock = big.NewInt(10)
+		config.ShanghaiBlock = londonBlock
+		config.CancunBlock = cancunBlock
 		signer = types.LatestSigner(gspec.Config)
 	}
 

diff --git a/eth/protocols/snap/sync_test.go b/eth/protocols/snap/sync_test.go
@@ -2016,7 +2016,8 @@ func verifyTrie(scheme string, db ethdb.KeyValueStore, root common.Hash, t *test
 func TestSyncAccountPerformance(t *testing.T) {
 	// These tests must not run in parallel: they modify the
 	// global var accountConcurrency
-	// t.Parallel()
+	t.Parallel()
+
 	testSyncAccountPerformance(t, rawdb.HashScheme)
 	testSyncAccountPerformance(t, rawdb.PathScheme)
 }