[ETCM-127] Regular sync integration tests (#740)

* regular sync - it - should update target block

* add it - should sync blockchain progressing forward in the same time

* it - should sync peers with divergent chains will be forced to resolve branches

* fix it with divergent chains

* refactor it - common behavior regular and fast sync

* style refactor

* fix style

* unify behavior between regular and fast sync

* unify fast and sync - change it regular sync assert

* change test descriptions

* add it scalafmt

Co-authored-by: Maximiliano Biandratti <[email protected]>
Co-authored-by: Piotr Paradziński <[email protected]>

Author: 3 people

build.sbt

@@ -68,7 +68,8 @@ val root = {
       libraryDependencies ++= dep
     )
     .settings(executableScriptName := name.value)
-    .settings(inConfig(Integration)(Defaults.testSettings :+ (Test / parallelExecution := false)): _*)
+    .settings(inConfig(Integration)(Defaults.testSettings
+      ++ org.scalafmt.sbt.ScalafmtPlugin.scalafmtConfigSettings :+ (Test / parallelExecution := false)): _*)
     .settings(inConfig(Benchmark)(Defaults.testSettings :+ (Test / parallelExecution := false)): _*)
     .settings(inConfig(Evm)(Defaults.testSettings :+ (Test / parallelExecution := false)): _*)
     .settings(inConfig(Ets)(Defaults.testSettings :+ (Test / parallelExecution := false)): _*)

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

@@ -1,23 +1,28 @@
 package io.iohk.ethereum.sync
 
-import java.net.{InetSocketAddress, ServerSocket}
-
 import akka.util.ByteString
 import io.iohk.ethereum.FlatSpecBase
 import io.iohk.ethereum.domain._
 import io.iohk.ethereum.ledger.InMemoryWorldStateProxy
 import io.iohk.ethereum.sync.FastSyncItSpec._
-import io.iohk.ethereum.sync.FastSyncItSpecUtils.{FakePeer, FakePeerCustomConfig, HostConfig}
+import io.iohk.ethereum.sync.util.FastSyncItSpecUtils.FakePeer
+import io.iohk.ethereum.sync.util.SyncCommonItSpec._
+import io.iohk.ethereum.sync.util.SyncCommonItSpecUtils._
 import monix.execution.Scheduler
-import org.scalatest.BeforeAndAfter
+import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.duration._
 
-class FastSyncItSpec extends FlatSpecBase with Matchers with BeforeAndAfter {
+class FastSyncItSpec extends FlatSpecBase with Matchers with BeforeAndAfterAll {
   implicit val testScheduler = Scheduler.fixedPool("test", 16)
 
-  "FastSync" should "should sync blockchain without state nodes" in customTestCaseResourceM(
+  override def afterAll(): Unit = {
+    testScheduler.shutdown()
+    testScheduler.awaitTermination(60.second)
+  }
+
+  "FastSync" should "sync blockchain without state nodes" in customTestCaseResourceM(
     FakePeer.start3FakePeersRes()
   ) { case (peer1, peer2, peer3) =>
     for {
@@ -32,7 +37,7 @@ class FastSyncItSpec extends FlatSpecBase with Matchers with BeforeAndAfter {
     }
   }
 
-  it should "should sync blockchain with state nodes" in customTestCaseResourceM(FakePeer.start3FakePeersRes()) {
+  it should "sync blockchain with state nodes" in customTestCaseResourceM(FakePeer.start3FakePeersRes()) {
     case (peer1, peer2, peer3) =>
       for {
         _ <- peer2.importBlocksUntil(1000)(updateStateAtBlock(500))
@@ -52,7 +57,7 @@ class FastSyncItSpec extends FlatSpecBase with Matchers with BeforeAndAfter {
       }
   }
 
-  it should "should sync blockchain with state nodes when peer do not response with full responses" in
+  it should "sync blockchain with state nodes when peer do not response with full responses" in
     customTestCaseResourceM(
       FakePeer.start3FakePeersRes(
         fakePeerCustomConfig2 = FakePeerCustomConfig(HostConfig()),
@@ -77,7 +82,7 @@ class FastSyncItSpec extends FlatSpecBase with Matchers with BeforeAndAfter {
       }
     }
 
-  it should "should sync blockchain with state nodes when one of the peers send empty state responses" in
+  it should "sync blockchain with state nodes when one of the peers send empty state responses" in
     customTestCaseResourceM(
       FakePeer.start3FakePeersRes(
         fakePeerCustomConfig2 = FakePeerCustomConfig(HostConfig()),
@@ -102,20 +107,19 @@ class FastSyncItSpec extends FlatSpecBase with Matchers with BeforeAndAfter {
       }
     }
 
-  it should "should update pivot block" in customTestCaseResourceM(FakePeer.start2FakePeersRes()) {
-    case (peer1, peer2) =>
-      for {
-        _ <- peer2.importBlocksUntil(1000)(IdentityUpdate)
-        _ <- peer1.connectToPeers(Set(peer2.node))
-        _ <- peer2.importBlocksUntil(2000)(IdentityUpdate).startAndForget
-        _ <- peer1.startFastSync().delayExecution(50.milliseconds)
-        _ <- peer1.waitForFastSyncFinish()
-      } yield {
-        assert(peer1.bl.getBestBlockNumber() == peer2.bl.getBestBlockNumber() - peer2.testSyncConfig.pivotBlockOffset)
-      }
+  it should "update pivot block" in customTestCaseResourceM(FakePeer.start2FakePeersRes()) { case (peer1, peer2) =>
+    for {
+      _ <- peer2.importBlocksUntil(1000)(IdentityUpdate)
+      _ <- peer1.connectToPeers(Set(peer2.node))
+      _ <- peer2.importBlocksUntil(2000)(IdentityUpdate).startAndForget
+      _ <- peer1.startFastSync().delayExecution(50.milliseconds)
+      _ <- peer1.waitForFastSyncFinish()
+    } yield {
+      assert(peer1.bl.getBestBlockNumber() == peer2.bl.getBestBlockNumber() - peer2.testSyncConfig.pivotBlockOffset)
+    }
   }
 
-  it should "should update pivot block and sync this new pivot block state" in customTestCaseResourceM(
+  it should "update pivot block and sync this new pivot block state" in customTestCaseResourceM(
     FakePeer.start2FakePeersRes()
   ) { case (peer1, peer2) =>
     for {
@@ -132,18 +136,6 @@ class FastSyncItSpec extends FlatSpecBase with Matchers with BeforeAndAfter {
 }
 
 object FastSyncItSpec {
-  def randomAddress(): InetSocketAddress = {
-    val s = new ServerSocket(0)
-    try {
-      new InetSocketAddress("localhost", s.getLocalPort)
-    } finally {
-      s.close()
-    }
-  }
-
-  final case class BlockchainState(bestBlock: Block, currentWorldState: InMemoryWorldStateProxy, currentTd: BigInt)
-
-  val IdentityUpdate: (BigInt, InMemoryWorldStateProxy) => InMemoryWorldStateProxy = (_, world) => world
 
   def updateWorldWithNAccounts(n: Int, world: InMemoryWorldStateProxy): InMemoryWorldStateProxy = {
     val resultWorld = (0 until n).foldLeft(world) { (world, num) =>