[ETCM-521] Fix failing test

Author: robinraju

src/it/scala/io/iohk/ethereum/sync/FastSyncItSpec.scala

@@ -230,7 +230,7 @@ class FastSyncItSpec extends FlatSpecBase with Matchers with BeforeAndAfterAll {
 
       _ <- peer1.connectToPeers(Set(peer2.node, peer3.node, peer4.node))
       _ <- peer1.startFastSync().delayExecution(50.milliseconds)
-      _ <- peer2.importBlocksUntil(1800)(IdentityUpdate)
+      _ <- peer2.importBlocksUntil(1200)(IdentityUpdate).startAndForget
       _ <- peer1.waitForFastSyncFinish()
     } yield {
       // Peer3 is blacklisted

src/it/scala/io/iohk/ethereum/sync/util/CommonFakePeer.scala

@@ -224,7 +224,7 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
     maxTargetDifference = 1,
     syncRetryInterval = 50.milliseconds,
     blacklistDuration = 100.seconds,
-    fastSyncMaxBatchRetries = 0,
+    fastSyncMaxBatchRetries = 2,
     fastSyncBlockValidationN = 200
   )
 

src/main/scala/io/iohk/ethereum/blockchain/sync/fast/FastSync.scala

@@ -343,6 +343,8 @@ class FastSync(
           context become waitingForBranchResolution
           branchResolver ! FastSyncBranchResolverActor.StartBranchResolver
           currentSkeletonState = None
+        } else {
+          syncState = syncState.enqueueHeaderRange(request)
         }
       }