[ETCM-503] testing in CI takes a lot of time (#877)

* [ETCM-503]-tests-timeout-in-ci
* [ETCM-504] PeerStatisticsSpec fix

Author: Dmitry Voronov

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

@@ -1,6 +1,7 @@
 package io.iohk.ethereum.sync.util
 
 import java.nio.file.Files
+import java.time.Clock
 import java.util.concurrent.atomic.AtomicReference
 
 import akka.actor.{ActorRef, ActorSystem}
@@ -55,6 +56,8 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
 
   import scala.language.postfixOps
 
+  implicit val clock = Clock.systemUTC()
+
   implicit val system = ActorSystem(peerName)
 
   val peerDiscoveryManager = TestProbe().ref

src/it/scala/io/iohk/ethereum/txExecTest/util/DumpChainApp.scala

@@ -1,5 +1,6 @@
 package io.iohk.ethereum.txExecTest.util
 
+import java.time.Clock
 import java.util.concurrent.atomic.AtomicReference
 
 import akka.actor.ActorSystem
@@ -97,7 +98,7 @@ object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder wit
 
   val peerMessageBus = actorSystem.actorOf(PeerEventBusActor.props)
 
-  val peerStatistics = actorSystem.actorOf(PeerStatisticsActor.props(peerMessageBus, 1.minute, 30))
+  val peerStatistics = actorSystem.actorOf(PeerStatisticsActor.props(peerMessageBus, 1.minute, 30)(Clock.systemUTC()))
 
   val peerManager = actorSystem.actorOf(
     PeerManagerActor.props(

src/main/scala/io/iohk/ethereum/network/PeerStatisticsActor.scala

@@ -4,12 +4,16 @@ import akka.actor._
 import io.iohk.ethereum.network.PeerEventBusActor._
 import io.iohk.ethereum.network.p2p.messages.Codes
 import java.time.Clock
+
+import io.iohk.ethereum.network.p2p.Message
+
 import scala.concurrent.duration.FiniteDuration
 
 class PeerStatisticsActor(
     peerEventBus: ActorRef,
     var maybeStats: Option[TimeSlotStats[PeerId, PeerStat]]
-) extends Actor {
+)(implicit clock: Clock)
+    extends Actor {
   import PeerStatisticsActor._
 
   override def preStart(): Unit = {
@@ -23,14 +27,7 @@ class PeerStatisticsActor(
 
   private def handlePeerEvents: Receive = {
     case PeerEvent.MessageFromPeer(msg, peerId) =>
-      val now = System.currentTimeMillis()
-      val obs = PeerStat(
-        responsesReceived = if (ResponseCodes(msg.code)) 1 else 0,
-        requestsReceived = if (RequestCodes(msg.code)) 1 else 0,
-        firstSeenTimeMillis = Some(now),
-        lastSeenTimeMillis = Some(now)
-      )
-      maybeStats = maybeStats.map(_.add(peerId, obs))
+      handleMessageFromPeer(msg, peerId)
 
     case PeerEvent.PeerDisconnected(peerId) =>
       maybeStats = maybeStats.map(_.remove(peerId))
@@ -45,13 +42,24 @@ class PeerStatisticsActor(
       val stats = maybeStats.map(_.get(peerId, Some(window))).getOrElse(PeerStat.empty)
       sender ! StatsForPeer(peerId, stats)
   }
+
+  private def handleMessageFromPeer(msg: Message, peerId: PeerId): Unit = {
+    val now = clock.millis
+    val obs = PeerStat(
+      responsesReceived = if (ResponseCodes(msg.code)) 1 else 0,
+      requestsReceived = if (RequestCodes(msg.code)) 1 else 0,
+      firstSeenTimeMillis = Some(now),
+      lastSeenTimeMillis = Some(now)
+    )
+    maybeStats = maybeStats.map(_.add(peerId, obs))
+  }
 }
 
 object PeerStatisticsActor {
-  def props(peerEventBus: ActorRef, slotDuration: FiniteDuration, slotCount: Int): Props =
+  def props(peerEventBus: ActorRef, slotDuration: FiniteDuration, slotCount: Int)(implicit clock: Clock): Props =
     Props {
-      implicit val clock = Clock.systemUTC()
-      new PeerStatisticsActor(peerEventBus, TimeSlotStats[PeerId, PeerStat](slotDuration, slotCount))
+      val stats = TimeSlotStats[PeerId, PeerStat](slotDuration, slotCount)
+      new PeerStatisticsActor(peerEventBus, stats)
     }
 
   case class GetStatsForAll(window: FiniteDuration)

src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala

@@ -1,5 +1,7 @@
 package io.iohk.ethereum.nodebuilder
 
+import java.time.Clock
+
 import akka.actor.{ActorRef, ActorSystem}
 import io.iohk.ethereum.blockchain.data.GenesisDataLoader
 import io.iohk.ethereum.blockchain.sync.{BlockchainHostActor, SyncController}
@@ -32,8 +34,10 @@ import io.iohk.ethereum.transactions.{PendingTransactionsManager, TransactionHis
 import io.iohk.ethereum.utils.Config.SyncConfig
 import io.iohk.ethereum.utils._
 import java.util.concurrent.atomic.AtomicReference
+
 import io.iohk.ethereum.consensus.blocks.CheckpointBlockGenerator
 import org.bouncycastle.crypto.AsymmetricCipherKeyPair
+
 import scala.concurrent.duration._
 import scala.util.{Failure, Success, Try}
 import akka.util.ByteString
@@ -188,6 +192,9 @@ trait PeerEventBusBuilder {
 trait PeerStatisticsBuilder {
   self: ActorSystemBuilder with PeerEventBusBuilder =>
 
+  // TODO: a candidate to move upwards in trait hierarchy?
+  implicit val clock = Clock.systemUTC()
+
   lazy val peerStatistics: ActorRef = system.actorOf(
     PeerStatisticsActor.props(
       peerEventBus,

src/test/scala/io/iohk/ethereum/blockchain/sync/FastSyncSpec.scala

@@ -22,7 +22,7 @@ class FastSyncSpec
     with FreeSpecBase
     with SpecFixtures
     with WithActorSystemShutDown { self =>
-  implicit val timeout: Timeout = Timeout(10.seconds)
+  implicit val timeout: Timeout = Timeout(30.seconds)
 
   class Fixture extends EphemBlockchainTestSetup with TestSyncConfig with TestSyncPeers {
     override implicit lazy val system = self.system

src/test/scala/io/iohk/ethereum/jsonrpc/server/http/JsonRpcHttpServerSpec.scala

@@ -469,7 +469,7 @@ class FakeJsonRpcHttpServer(
   def run(): Unit = ()
   override def corsAllowedOrigins: HttpOriginMatcher = cors
 
-  var mockedTime:Long = 0L
+  var mockedTime: Long = 0L
 
   override protected val rateLimit: RateLimit = new RateLimit(config.rateLimit) {
     override protected def getCurrentTimeNanos: Long = FakeJsonRpcHttpServer.this.mockedTime

src/test/scala/io/iohk/ethereum/network/PeerStatisticsSpec.scala

@@ -5,8 +5,10 @@ import akka.testkit.{TestKit, TestProbe}
 import io.iohk.ethereum.network.PeerEventBusActor._
 import io.iohk.ethereum.network.p2p.messages.PV61.NewBlockHashes
 import io.iohk.ethereum.WithActorSystemShutDown
+import io.iohk.ethereum.utils.MockClock
 import org.scalatest.flatspec.AnyFlatSpecLike
 import org.scalatest.matchers.should.Matchers
+
 import scala.concurrent.duration._
 
 class PeerStatisticsSpec
@@ -17,6 +19,14 @@ class PeerStatisticsSpec
 
   import PeerStatisticsActor._
 
+  val TICK: Long = 50
+  val mockClock = new MockClock(0L) {
+    override def millis(): Long = {
+      windByMillis(TICK)
+      super.millis()
+    }
+  }
+
   behavior of "PeerStatisticsActor"
 
   it should "subscribe to peer events" in new Fixture {
@@ -48,7 +58,11 @@ class PeerStatisticsSpec
 
     val statA = stats.stats(alice)
     statA.responsesReceived shouldBe 2
-    statA.lastSeenTimeMillis shouldBe >(statA.firstSeenTimeMillis)
+    val difference = for {
+      first <- statA.firstSeenTimeMillis
+      last <- statA.lastSeenTimeMillis
+    } yield last - first
+    assert(difference.exists(_ >= TICK))
 
     val statB = stats.stats(bob)
     statB.responsesReceived shouldBe 1
@@ -61,6 +75,6 @@ class PeerStatisticsSpec
 
     val peerEventBus = TestProbe()
     val peerStatistics =
-      system.actorOf(PeerStatisticsActor.props(peerEventBus.ref, slotDuration = 1.minute, slotCount = 30))
+      system.actorOf(PeerStatisticsActor.props(peerEventBus.ref, slotDuration = 1.minute, slotCount = 30)(mockClock))
   }
 }

src/test/scala/io/iohk/ethereum/network/TimeSlotStatsSpec.scala

@@ -12,8 +12,7 @@ import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 import org.scalacheck.{Arbitrary, Gen, Shrink}, Arbitrary.arbitrary
 import scala.concurrent.duration._
 import org.scalatest.compatible.Assertion
-import java.time.ZoneId
-import java.time.Instant
+import io.iohk.ethereum.utils.MockClock
 
 class TimeSlotStatsSpec extends AnyFlatSpec with Matchers with ScalaCheckDrivenPropertyChecks {
   import TimeSlotStatsSpec._
@@ -154,7 +153,8 @@ class TimeSlotStatsSpec extends AnyFlatSpec with Matchers with ScalaCheckDrivenP
 
   it should "handle 0 in configuration" in {
     // This might happen if we base the values on something which can be 0.
-    implicit val clock = Clock.systemUTC()
+    implicit val clock: Clock = Clock.systemUTC()
+
     val zeros = List(
       TimeSlotStats[String, Int](slotDuration = 1.minutes, slotCount = 0),
       TimeSlotStats[String, Int](slotDuration = 0.minutes, slotCount = 1)
@@ -217,18 +217,7 @@ class TimeSlotStatsSpec extends AnyFlatSpec with Matchers with ScalaCheckDrivenP
 
 object TimeSlotStatsSpec {
 
-  class MockClock(
-      private var currentTimeMillis: Long = System.currentTimeMillis,
-      zoneId: ZoneId = ZoneId.of("UTC")
-  ) extends Clock {
-    def windByMillis(by: Long): Unit =
-      currentTimeMillis = currentTimeMillis + by
-
-    override def instant(): Instant = Instant.ofEpochMilli(currentTimeMillis)
-    // The following are implemented for completness' sake but not used:
-    override def getZone(): ZoneId = zoneId
-    override def withZone(x: ZoneId): Clock = new MockClock(currentTimeMillis, zoneId)
-  }
+  implicit val clock = new MockClock()
 
   type TestState[K, V, A] = State[(TimeSlotStats[K, V], MockClock), A]
 
@@ -256,7 +245,6 @@ object TimeSlotStatsSpec {
     }
 
   def test[K, V: Monoid](s: TestState[K, V, Assertion]): Unit = {
-    implicit val clock = new MockClock()
     val stats = TimeSlotStats[K, V](defaultSlotDuration, defaultSlotCount).get
     s.run(stats -> clock).value
   }
@@ -271,14 +259,12 @@ object TimeSlotStatsSpec {
       keyCount <- Gen.choose(1, 5)
       keys <- Gen.listOfN(keyCount, arbitrary[K])
       eventCount <- Gen.choose(0, 100)
-      timestamp = System.currentTimeMillis
       event = for {
         d <- Gen.choose(0, 10 * 60).map(_.seconds)
         k <- Gen.oneOf(keys)
         v <- arbitrary[V]
       } yield (d, k, v)
       events <- Gen.listOfN(eventCount, event)
-      clock = new MockClock()
       empty = TimeSlotStats[K, V](slotDuration, slotCount)(Monoid[V], clock).get
       stats = events.foldLeft(empty) { case (stats, (duration, key, stat)) =>
         clock.windByMillis(duration.toMillis)

src/test/scala/io/iohk/ethereum/utils/MockClock.scala

@@ -0,0 +1,16 @@
+package io.iohk.ethereum.utils
+
+import java.time.{Clock, Instant, ZoneId}
+
+class MockClock(
+    private var currentTimeMillis: Long = System.currentTimeMillis,
+    zoneId: ZoneId = ZoneId.of("UTC")
+) extends Clock {
+  def windByMillis(by: Long): Unit =
+    currentTimeMillis = currentTimeMillis + by
+
+  override def instant(): Instant = Instant.ofEpochMilli(currentTimeMillis)
+  // The following are implemented for completness' sake but not used:
+  override def getZone(): ZoneId = zoneId
+  override def withZone(x: ZoneId): Clock = new MockClock(currentTimeMillis, zoneId)
+}