sync: coreth PR #1361: test: Fix state sync flakes (#1859)

Signed-off-by: Austin Larson <[email protected]>
Co-authored-by: Austin Larson <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>

Author: 3 people

scripts/known_flakes.txt

@@ -2,8 +2,6 @@ TestChainIndexerWithChildren
 TestClientCancelWebsocket
 TestClientWebsocketLargeMessage
 TestMempoolEthTxsAppGossipHandling
-TestResumeSyncAccountsTrieInterrupted
-TestResyncNewRootAfterDeletes
 TestTransactionSkipIndexing
 TestVMShutdownWhileSyncing
 TestWaitDeployedCornerCases

sync/statesync/sync_test.go

@@ -228,7 +228,7 @@ func TestCancelSync(t *testing.T) {
 // function which returns [errInterrupted] after passing through [numRequests]
 // leafs requests for [root].
 type interruptLeafsIntercept struct {
-	numRequests    uint32
+	numRequests    atomic.Uint32
 	interruptAfter uint32
 	root           common.Hash
 }
@@ -238,7 +238,7 @@ type interruptLeafsIntercept struct {
 // After that, all requests for leafs from [root] return [errInterrupted].
 func (i *interruptLeafsIntercept) getLeafsIntercept(request message.LeafsRequest, response message.LeafsResponse) (message.LeafsResponse, error) {
 	if request.Root == i.root {
-		if numRequests := atomic.AddUint32(&i.numRequests, 1); numRequests > i.interruptAfter {
+		if numRequests := i.numRequests.Add(1); numRequests > i.interruptAfter {
 			return message.LeafsResponse{}, errInterrupted
 		}
 	}
@@ -263,7 +263,7 @@ func TestResumeSyncAccountsTrieInterrupted(t *testing.T) {
 		GetLeafsIntercept: intercept.getLeafsIntercept,
 	})
 
-	require.Equal(t, uint32(2), intercept.numRequests)
+	require.GreaterOrEqual(t, intercept.numRequests.Load(), uint32(2))
 
 	testSync(t, syncTest{
 		prepareForTest: func(*testing.T, *rand.Rand) (ethdb.Database, ethdb.Database, *triedb.Database, common.Hash) {