[ETCM-313] Fix integration tests, format error messages

Author: robinraju

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

@@ -59,49 +59,53 @@ class FastSyncItSpec extends FlatSpecBase with Matchers with BeforeAndAfterAll {
 
   it should "sync blockchain with state nodes when peer do not response with full responses" in
     customTestCaseResourceM(
-      FakePeer.start3FakePeersRes(
+      FakePeer.start4FakePeersRes(
         fakePeerCustomConfig2 = FakePeerCustomConfig(HostConfig()),
         fakePeerCustomConfig3 = FakePeerCustomConfig(HostConfig())
       )
-    ) { case (peer1, peer2, peer3) =>
+    ) { case (peer1, peer2, peer3, peer4) =>
       for {
         _ <- peer2.importBlocksUntil(1000)(updateStateAtBlock(500))
         _ <- peer3.importBlocksUntil(1000)(updateStateAtBlock(500))
-        _ <- peer1.connectToPeers(Set(peer2.node, peer3.node))
+        _ <- peer4.importBlocksUntil(1000)(updateStateAtBlock(500))
+
+        _ <- peer1.connectToPeers(Set(peer2.node, peer3.node, peer4.node))
         _ <- peer1.startFastSync().delayExecution(50.milliseconds)
         _ <- peer1.waitForFastSyncFinish()
       } yield {
         val trie = peer1.getBestBlockTrie()
         val synchronizingPeerHaveAllData = peer1.containsExpectedDataUpToAccountAtBlock(1000, 500)
-        // due to the fact that function generating state is deterministic both peer2 and peer3 ends up with exactly same
+        // due to the fact that function generating state is deterministic both peer3 and peer4 ends up with exactly same
         // state, so peer1 can get whole trie from both of them.
-        assert(peer1.bl.getBestBlockNumber() == peer2.bl.getBestBlockNumber() - peer2.testSyncConfig.pivotBlockOffset)
         assert(peer1.bl.getBestBlockNumber() == peer3.bl.getBestBlockNumber() - peer3.testSyncConfig.pivotBlockOffset)
+        assert(peer1.bl.getBestBlockNumber() == peer4.bl.getBestBlockNumber() - peer4.testSyncConfig.pivotBlockOffset)
         assert(trie.isDefined)
         assert(synchronizingPeerHaveAllData)
       }
     }
 
   it should "sync blockchain with state nodes when one of the peers send empty state responses" in
     customTestCaseResourceM(
-      FakePeer.start3FakePeersRes(
+      FakePeer.start4FakePeersRes(
         fakePeerCustomConfig2 = FakePeerCustomConfig(HostConfig()),
         fakePeerCustomConfig3 = FakePeerCustomConfig(HostConfig().copy(maxMptComponentsPerMessage = 0))
       )
-    ) { case (peer1, peer2, peer3) =>
+    ) { case (peer1, peer2, peer3, peer4) =>
       for {
         _ <- peer2.importBlocksUntil(1000)(updateStateAtBlock(500))
         _ <- peer3.importBlocksUntil(1000)(updateStateAtBlock(500))
-        _ <- peer1.connectToPeers(Set(peer2.node, peer3.node))
+        _ <- peer4.importBlocksUntil(1000)(updateStateAtBlock(500))
+
+        _ <- peer1.connectToPeers(Set(peer2.node, peer3.node, peer4.node))
         _ <- peer1.startFastSync().delayExecution(50.milliseconds)
         _ <- peer1.waitForFastSyncFinish()
       } yield {
         val trie = peer1.getBestBlockTrie()
         val synchronizingPeerHaveAllData = peer1.containsExpectedDataUpToAccountAtBlock(1000, 500)
-        // due to the fact that function generating state is deterministic both peer2 and peer3 ends up with exactly same
+        // due to the fact that function generating state is deterministic both peer3 and peer4 ends up with exactly same
         // state, so peer1 can get whole trie from both of them.
-        assert(peer1.bl.getBestBlockNumber() == peer2.bl.getBestBlockNumber() - peer2.testSyncConfig.pivotBlockOffset)
         assert(peer1.bl.getBestBlockNumber() == peer3.bl.getBestBlockNumber() - peer3.testSyncConfig.pivotBlockOffset)
+        assert(peer1.bl.getBestBlockNumber() == peer4.bl.getBestBlockNumber() - peer4.testSyncConfig.pivotBlockOffset)
         assert(trie.isDefined)
         assert(synchronizingPeerHaveAllData)
       }

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

@@ -222,7 +222,8 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
     startRetryInterval = 50.milliseconds,
     nodesPerRequest = 200,
     maxTargetDifference = 1,
-    syncRetryInterval = 50.milliseconds
+    syncRetryInterval = 50.milliseconds,
+    blacklistDuration = 100.seconds
   )
 
   lazy val broadcaster = new BlockBroadcast(etcPeerManager)

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

@@ -171,26 +171,27 @@ object HeaderSkeleton {
     override def msg: String = s"Invalid downloaded total headers. Expected $expected but was $downloaded"
   }
   case class InvalidHeaderNumber(downloaded: Seq[BigInt], expected: Seq[BigInt]) extends HeaderSkeletonError {
-    override def msg: String = s"Invalid sequence of skeleton headers. Expected $expected but was $downloaded"
+    override def msg: String =
+      s"Invalid sequence of skeleton headers. Expected [${expected.mkString(",")}] but was [${downloaded.mkString(",")}]"
   }
 
   sealed trait HeaderBatchError extends HeaderSkeletonError
   case class InvalidBatchLastNumber(downloaded: BigInt, expected: Seq[BigInt]) extends HeaderBatchError {
-    override def msg: String = s"Invalid batch last number. $downloaded wasn't found in $expected"
+    override def msg: String = s"Invalid batch last number. $downloaded wasn't found in [${expected.mkString(",")}]"
   }
   case class InvalidBatchHash(downloaded: BlockHeader, expected: BlockHeader) extends HeaderBatchError {
     override def msg: String = s"Invalid batch last block hash. Expected $expected but was $downloaded"
   }
   case class EmptyDownloadedBatch(expected: Seq[BigInt]) extends HeaderBatchError {
-    override def msg: String = s"Downloaded empty headers batch. Expected $expected"
+    override def msg: String = s"Downloaded empty headers batch. Expected [${expected.mkString(",")}]"
   }
   case class InvalidPenultimateHeader(penultimateBatchHeader: BlockHeader, skeletonHeader: BlockHeader)
       extends HeaderBatchError {
     override def msg: String =
       s"Invalid batch penultimate header. $penultimateBatchHeader isn't parent of $skeletonHeader"
   }
   case class InvalidBatchFirstNumber(downloaded: BigInt, expected: Seq[BigInt]) extends HeaderBatchError {
-    override def msg: String = s"Invalid batch first number. $downloaded wasn't found in $expected"
+    override def msg: String = s"Invalid batch first number. $downloaded wasn't found in [${expected.mkString(",")}]"
   }
   case class InvalidDownloadedChain(downloaded: Seq[BlockHeader]) extends HeaderBatchError {
     override def msg: String = s"Invalid downloaded batch: ${downloaded.map(h => h.number -> h.hash).mkString(", ")}"