UT: fix some flaky tests (ethereum#1379)

* core/state: Remove prefetcher on stop * core/blockchain: Wait for `triedb.Dereference` in `writeBlockWithState` * eth/protocols/diff: Fix index mismatch in `TestGetDiffLayers`
streamingfast · Apr 3, 2023 · 221ef7d · 221ef7d
1 parent bd76c25
commit 221ef7d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/core/blockchain.go b/core/blockchain.go
@@ -1552,7 +1552,11 @@ func (bc *BlockChain) writeBlockWithState(block *types.Block, receipts []*types.
 						bc.triegc.Push(root, number)
 						break
 					}
-					go triedb.Dereference(root.(common.Hash))
+					wg.Add(1)
+					go func() {
+						triedb.Dereference(root.(common.Hash))
+						wg.Done()
+					}()
 				}
 			}
 		}

diff --git a/core/state/statedb.go b/core/state/statedb.go
@@ -251,6 +251,7 @@ func (s *StateDB) StopPrefetcher() {
 	s.prefetcherLock.Lock()
 	if s.prefetcher != nil {
 		s.prefetcher.close()
+		s.prefetcher = nil
 	}
 	s.prefetcherLock.Unlock()
 }

diff --git a/eth/protocols/diff/handler_test.go b/eth/protocols/diff/handler_test.go
@@ -134,9 +134,9 @@ func testGetDiffLayers(t *testing.T, protocol uint) {
 	missDiffPackets := make([]FullDiffLayersPacket, 0)
 
 	for i := 0; i < 100; i++ {
-		number := uint64(rand.Int63n(1024))
-		if number == 0 {
-			continue
+		// Find a non 0 random number
+		var number uint64
+		for ; number == 0; number = uint64(rand.Int63n(1024)) {
 		}
 		foundHash := backend.chain.GetCanonicalHash(number + 1024)
 		missHash := backend.chain.GetCanonicalHash(number)