ETCM-760: Adapt tests

Author: AnastasiiaL

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

@@ -10,7 +10,7 @@ import akka.util.{ByteString, Timeout}
 import io.iohk.ethereum.blockchain.sync.regular.BlockBroadcast.BlockToBroadcast
 import io.iohk.ethereum.blockchain.sync.regular.{BlockBroadcast, BlockBroadcasterActor}
 import io.iohk.ethereum.blockchain.sync.regular.BlockBroadcasterActor.BroadcastBlock
-import io.iohk.ethereum.blockchain.sync.{BlockchainHostActor, TestSyncConfig}
+import io.iohk.ethereum.blockchain.sync.{BlockchainHostActor, CacheBasedBlacklist, TestSyncConfig}
 import io.iohk.ethereum.db.components.{RocksDbDataSourceComponent, Storages}
 import io.iohk.ethereum.db.dataSource.{RocksDbConfig, RocksDbDataSource}
 import io.iohk.ethereum.db.storage.pruning.{ArchivePruning, PruningMode}
@@ -27,15 +27,7 @@ import io.iohk.ethereum.network.handshaker.{EtcHandshaker, EtcHandshakerConfigur
 import io.iohk.ethereum.network.p2p.EthereumMessageDecoder
 import io.iohk.ethereum.network.rlpx.AuthHandshaker
 import io.iohk.ethereum.network.rlpx.RLPxConnectionHandler.RLPxConfiguration
-import io.iohk.ethereum.network.{
-  EtcPeerManagerActor,
-  ForkResolver,
-  KnownNodesManager,
-  PeerEventBusActor,
-  PeerManagerActor,
-  PeerStatisticsActor,
-  ServerActor
-}
+import io.iohk.ethereum.network.{EtcPeerManagerActor, ForkResolver, KnownNodesManager, PeerEventBusActor, PeerManagerActor, PeerStatisticsActor, ServerActor}
 import io.iohk.ethereum.nodebuilder.PruningConfigBuilder
 import io.iohk.ethereum.sync.util.SyncCommonItSpec._
 import io.iohk.ethereum.sync.util.SyncCommonItSpecUtils._
@@ -179,6 +171,8 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
   lazy val peerStatistics =
     system.actorOf(PeerStatisticsActor.props(peerEventBus, slotDuration = 1.minute, slotCount = 30))
 
+  lazy val blacklist: CacheBasedBlacklist = CacheBasedBlacklist.empty(1000)
+
   lazy val peerManager: ActorRef = system.actorOf(
     PeerManagerActor.props(
       peerDiscoveryManager,
@@ -190,6 +184,7 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
       authHandshaker,
       EthereumMessageDecoder,
       discoveryConfig,
+      blacklist,
       Config.Network.protocolVersion
     ),
     "peer-manager"
@@ -231,7 +226,7 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
   lazy val broadcaster = new BlockBroadcast(etcPeerManager)
 
   lazy val broadcasterActor = system.actorOf(
-    BlockBroadcasterActor.props(broadcaster, peerEventBus, etcPeerManager, testSyncConfig, system.scheduler)
+    BlockBroadcasterActor.props(broadcaster, peerEventBus, etcPeerManager, blacklist, testSyncConfig, system.scheduler)
   )
 
   private def getMptForBlock(block: Block) = {

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

@@ -17,17 +17,13 @@ import monix.eval.Task
 import scala.annotation.tailrec
 import scala.concurrent.duration._
 import scala.util.Try
-import io.iohk.ethereum.blockchain.sync.CacheBasedBlacklist
 object FastSyncItSpecUtils {
 
   class FakePeer(peerName: String, fakePeerCustomConfig: FakePeerCustomConfig)
       extends CommonFakePeer(peerName, fakePeerCustomConfig) {
 
     lazy val validators = new MockValidatorsAlwaysSucceed
 
-    val maxSize = 1000
-    val blacklist = CacheBasedBlacklist.empty(maxSize)
-
     lazy val fastSync = system.actorOf(
       FastSync.props(
         storagesInstance.storages.fastSyncStateStorage,

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

@@ -62,7 +62,7 @@ object RegularSyncItSpecUtils {
 
     lazy val checkpointBlockGenerator: CheckpointBlockGenerator = new CheckpointBlockGenerator
     lazy val peersClient: ActorRef =
-      system.actorOf(PeersClient.props(etcPeerManager, peerEventBus, testSyncConfig, system.scheduler), "peers-client")
+      system.actorOf(PeersClient.props(etcPeerManager, peerEventBus, blacklist, testSyncConfig, system.scheduler), "peers-client")
 
     lazy val ledger: Ledger =
       new LedgerImpl(bl, blockchainConfig, syncConfig, buildEthashConsensus(), Scheduler.global)
@@ -78,7 +78,7 @@ object RegularSyncItSpecUtils {
 
     val broadcasterRef: ActorRef = system.actorOf(
       BlockBroadcasterActor
-        .props(new BlockBroadcast(etcPeerManager), peerEventBus, etcPeerManager, syncConfig, system.scheduler),
+        .props(new BlockBroadcast(etcPeerManager), peerEventBus, etcPeerManager, blacklist, syncConfig, system.scheduler),
       "block-broadcaster"
     )
 
@@ -109,6 +109,7 @@ object RegularSyncItSpecUtils {
         ledger,
         bl,
         validators.blockValidator,
+        blacklist,
         testSyncConfig,
         ommersPool,
         pendingTransactionsManager,

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

@@ -2,9 +2,11 @@ package io.iohk.ethereum.txExecTest.util
 
 import java.time.Clock
 import java.util.concurrent.atomic.AtomicReference
+
 import akka.actor.ActorSystem
 import akka.util.ByteString
 import com.typesafe.config.ConfigFactory
+import io.iohk.ethereum.blockchain.sync.CacheBasedBlacklist
 import io.iohk.ethereum.db.components.Storages.PruningModeComponent
 import io.iohk.ethereum.db.components.{RocksDbDataSourceComponent, Storages}
 import io.iohk.ethereum.db.dataSource.{DataSourceBatchUpdate, RocksDbDataSource}
@@ -100,6 +102,8 @@ object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder wit
 
   val peerStatistics = actorSystem.actorOf(PeerStatisticsActor.props(peerMessageBus, 1.minute, 30)(Clock.systemUTC()))
 
+  val blacklist: CacheBasedBlacklist = CacheBasedBlacklist.empty(100)
+
   val peerManager = actorSystem.actorOf(
     PeerManagerActor.props(
       peerDiscoveryManager = actorSystem.deadLetters, // TODO: fixme
@@ -111,6 +115,7 @@ object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder wit
       authHandshaker = authHandshaker,
       messageDecoder = EthereumMessageDecoder,
       discoveryConfig = discoveryConfig,
+      blacklist = blacklist,
       bestProtocolVersion = Config.Network.protocolVersion
     ),
     "peer-manager"

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

@@ -1,8 +1,10 @@
 package io.iohk.ethereum.blockchain.sync
 
 import java.net.InetSocketAddress
+
 import akka.actor.ActorSystem
 import akka.testkit.{TestKit, TestProbe}
+import io.iohk.ethereum.blockchain.sync.PeerListSupportNg.PeerWithInfo
 import io.iohk.ethereum.blockchain.sync.regular.BlockBroadcast
 import io.iohk.ethereum.blockchain.sync.regular.BlockBroadcast.BlockToBroadcast
 import io.iohk.ethereum.domain.{Block, BlockBody, BlockHeader, ChainWeight}
@@ -30,7 +32,7 @@ class BlockBroadcastSpec
       NewBlock(Block(blockHeader, BlockBody(Nil, Nil)), initialPeerInfo.chainWeight.increaseTotalDifficulty(2))
 
     //when
-    blockBroadcast.broadcastBlock(BlockToBroadcast(newBlock.block, newBlock.chainWeight), Map(peer -> initialPeerInfo))
+    blockBroadcast.broadcastBlock(BlockToBroadcast(newBlock.block, newBlock.chainWeight), Map(peer.id -> PeerWithInfo(peer, initialPeerInfo)))
 
     //then
     etcPeerManagerProbe.expectMsg(EtcPeerManagerActor.SendMessage(newBlock, peer.id))
@@ -52,7 +54,7 @@ class BlockBroadcastSpec
     //when
     blockBroadcast.broadcastBlock(
       BlockToBroadcast(newBlock.block, ChainWeight.totalDifficultyOnly(newBlock.totalDifficulty)),
-      Map(peer -> peerInfo)
+      Map(peer.id -> PeerWithInfo(peer, peerInfo))
     )
 
     //then
@@ -69,7 +71,7 @@ class BlockBroadcastSpec
       NewBlock(Block(blockHeader, BlockBody(Nil, Nil)), initialPeerInfo.chainWeight.increaseTotalDifficulty(-2))
 
     //when
-    blockBroadcast.broadcastBlock(BlockToBroadcast(newBlock.block, newBlock.chainWeight), Map(peer -> initialPeerInfo))
+    blockBroadcast.broadcastBlock(BlockToBroadcast(newBlock.block, newBlock.chainWeight), Map(peer.id -> PeerWithInfo(peer, initialPeerInfo)))
 
     //then
     etcPeerManagerProbe.expectNoMessage()
@@ -83,7 +85,7 @@ class BlockBroadcastSpec
       NewBlock(Block(blockHeader, BlockBody(Nil, Nil)), initialPeerInfo.chainWeight.increaseTotalDifficulty(-2))
 
     //when
-    blockBroadcast.broadcastBlock(BlockToBroadcast(newBlock.block, newBlock.chainWeight), Map(peer -> initialPeerInfo))
+    blockBroadcast.broadcastBlock(BlockToBroadcast(newBlock.block, newBlock.chainWeight), Map(peer.id -> PeerWithInfo(peer, initialPeerInfo)))
 
     //then
     etcPeerManagerProbe.expectMsg(EtcPeerManagerActor.SendMessage(newBlock, peer.id))
@@ -99,7 +101,7 @@ class BlockBroadcastSpec
       NewBlock(Block(blockHeader, BlockBody(Nil, Nil)), initialPeerInfo.chainWeight.increaseTotalDifficulty(-2))
 
     //when
-    blockBroadcast.broadcastBlock(BlockToBroadcast(newBlock.block, newBlock.chainWeight), Map(peer -> initialPeerInfo))
+    blockBroadcast.broadcastBlock(BlockToBroadcast(newBlock.block, newBlock.chainWeight), Map(peer.id -> PeerWithInfo(peer, initialPeerInfo)))
 
     //then
     etcPeerManagerProbe.expectNoMessage()
@@ -122,7 +124,7 @@ class BlockBroadcastSpec
     //when
     val peers = Seq(peer, peer2, peer3, peer4)
     val peersIds = peers.map(_.id)
-    val peersWithInfo = peers.map(_ -> initialPeerInfo).toMap
+    val peersWithInfo = peers.map(peer => peer.id -> PeerWithInfo(peer, initialPeerInfo)).toMap
     blockBroadcast.broadcastBlock(BlockToBroadcast(firstBlock.block, firstBlock.chainWeight), peersWithInfo)
 
     //then

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

@@ -4,10 +4,10 @@ import akka.testkit.TestActor.AutoPilot
 import akka.testkit.TestProbe
 import akka.util.ByteString
 import cats.effect.concurrent.Deferred
-import io.iohk.ethereum.blockchain.sync.PeerListSupport.PeersMap
+import io.iohk.ethereum.blockchain.sync.PeerListSupportNg.PeerWithInfo
 import io.iohk.ethereum.domain.{Block, BlockHeader}
-import io.iohk.ethereum.network.EtcPeerManagerActor
-import io.iohk.ethereum.network.EtcPeerManagerActor.SendMessage
+import io.iohk.ethereum.network.{EtcPeerManagerActor, Peer, PeerId}
+import io.iohk.ethereum.network.EtcPeerManagerActor.{PeerInfo, SendMessage}
 import io.iohk.ethereum.network.PeerEventBusActor.PeerEvent.MessageFromPeer
 import io.iohk.ethereum.network.p2p.messages.PV62.{BlockBodies, BlockHeaders, GetBlockBodies, GetBlockHeaders}
 import io.iohk.ethereum.network.p2p.messages.PV63.{GetNodeData, GetReceipts, NodeData, Receipts}
@@ -19,7 +19,7 @@ import monix.reactive.subjects.{ReplaySubject, Subject}
 
 class EtcPeerManagerFake(
     syncConfig: SyncConfig,
-    peers: PeersMap,
+    peers: Map[Peer, PeerInfo],
     blocks: List[Block],
     getMptNodes: List[ByteString] => List[ByteString]
 )(implicit system: ActorSystem, scheduler: Scheduler) {
@@ -82,7 +82,7 @@ class EtcPeerManagerFake(
     .map(_._1)
     .combineLatestMap(requestedReceipts)((blocks, _) => blocks) // a big simplification, but should be sufficient here
 
-  val fetchedState = responses.collect { case MessageFromPeer(NodeData(values), peerId) =>
+  val fetchedState = responses.collect { case MessageFromPeer(NodeData(values), _) =>
     values
   }
 
@@ -92,7 +92,7 @@ object EtcPeerManagerFake {
       requests: Subject[SendMessage, SendMessage],
       responses: Subject[MessageFromPeer, MessageFromPeer],
       peersConnected: Deferred[Task, Unit],
-      peers: PeersMap,
+      peers: Map[Peer, PeerInfo],
       blocks: List[Block],
       getMptNodes: List[ByteString] => List[ByteString]
   )(implicit scheduler: Scheduler)

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

@@ -1,9 +1,11 @@
 package io.iohk.ethereum.blockchain.sync
 
 import java.net.InetSocketAddress
+
 import akka.actor.ActorSystem
 import akka.testkit.TestProbe
 import akka.util.ByteString
+import io.iohk.ethereum.blockchain.sync.PeerListSupportNg.PeerWithInfo
 import io.iohk.ethereum.domain.ChainWeight
 import io.iohk.ethereum.network.EtcPeerManagerActor.{PeerInfo, RemoteStatus}
 import io.iohk.ethereum.network.{Peer, PeerId}
@@ -16,35 +18,35 @@ class PeersClientSpec extends AnyFlatSpec with Matchers with ScalaCheckPropertyC
   "PeerClient" should "determined the best peer based on it latest checkpoint number and total difficulty" in {
     import Peers._
 
-    val table = Table[Map[Peer, PeerInfo], Option[Peer], String](
+    val table = Table[Map[PeerId, PeerWithInfo], Option[Peer], String](
       ("PeerInfo map", "Expected best peer", "Scenario info (selected peer)"),
       (
         Map(),
         None,
         "No peers"
       ),
       (
-        Map(peer1 -> peerInfo(0, 100, fork = false)),
+        Map(peer1.id -> PeerWithInfo(peer1, peerInfo(0, 100, fork = false))),
         None,
         "Single peer"
       ),
       (
-        Map(peer1 -> peerInfo(0, 100, fork = false), peer2 -> peerInfo(0, 50, fork = true)),
+        Map(peer1.id -> PeerWithInfo(peer1, peerInfo(0, 100, fork = false)), peer2.id -> PeerWithInfo(peer2, peerInfo(0, 50, fork = true))),
         Some(peer2),
         "Peer2 with lower TD but following the ETC fork"
       ),
       (
-        Map(peer1 -> peerInfo(0, 100), peer2 -> peerInfo(0, 101)),
+        Map(peer1.id -> PeerWithInfo(peer1, peerInfo(0, 100)), peer2.id -> PeerWithInfo(peer2, peerInfo(0, 101))),
         Some(peer2),
         "Peer2 with higher TD"
       ),
       (
-        Map(peer1 -> peerInfo(0, 100), peer2 -> peerInfo(0, 101), peer3 -> peerInfo(1, 50)),
+        Map(peer1.id -> PeerWithInfo(peer1, peerInfo(0, 100)), peer2.id -> PeerWithInfo(peer2, peerInfo(0, 101)), peer3.id -> PeerWithInfo(peer3, peerInfo(1, 50))),
         Some(peer3),
         "Peer3 with lower TD but higher checkpoint number"
       ),
       (
-        Map(peer1 -> peerInfo(0, 100), peer2 -> peerInfo(4, 101), peer3 -> peerInfo(4, 50)),
+        Map(peer1.id -> PeerWithInfo(peer1, peerInfo(0, 100)), peer2.id -> PeerWithInfo(peer2, peerInfo(4, 101)), peer3.id -> PeerWithInfo(peer3, peerInfo(4, 50))),
         Some(peer2),
         "Peer2 with equal checkpoint number and higher TD"
       )

src/test/scala/io/iohk/ethereum/blockchain/sync/regular/BlockFetcherSpec.scala

@@ -24,6 +24,8 @@ import io.iohk.ethereum.{BlockHelpers, Timeouts}
 import org.scalatest.freespec.AnyFreeSpecLike
 import org.scalatest.matchers.should.Matchers
 
+import io.iohk.ethereum.blockchain.sync.Blacklist.BlacklistReason
+
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._
 
@@ -96,7 +98,7 @@ class BlockFetcherSpec
       peersClient.expectNoMessage()
 
       // Failure of the second request should make the fetcher resume with his requests
-      peersClient.send(refExpectingReply, PeersClient.RequestFailed(fakePeer, ""))
+      peersClient.send(refExpectingReply, PeersClient.RequestFailed(fakePeer, BlacklistReason.RegularSyncRequestFailed("")))
 
       peersClient.expectMsgClass(classOf[BlacklistPeer])
       peersClient.expectMsgPF() { case PeersClient.Request(msg, _, _) if msg == firstGetBlockHeadersRequest => () }

src/test/scala/io/iohk/ethereum/blockchain/sync/regular/RegularSyncFixtures.scala

@@ -10,7 +10,6 @@ import akka.util.{ByteString, Timeout}
 import cats.Eq
 import cats.implicits._
 import io.iohk.ethereum.BlockHelpers
-import io.iohk.ethereum.blockchain.sync.PeerListSupport.PeersMap
 import io.iohk.ethereum.blockchain.sync._
 import io.iohk.ethereum.consensus.blocks.CheckpointBlockGenerator
 import io.iohk.ethereum.domain.BlockHeaderImplicits._
@@ -50,7 +49,7 @@ trait RegularSyncFixtures { self: Matchers with AsyncMockFactory =>
     implicit override lazy val system: ActorSystem = _system
     override lazy val syncConfig: SyncConfig =
       defaultSyncConfig.copy(blockHeadersPerRequest = 2, blockBodiesPerRequest = 2)
-    val handshakedPeers: PeersMap = (0 to 5).toList.map((peerId _).andThen(getPeer)).fproduct(getPeerInfo(_)).toMap
+    val handshakedPeers: Map[Peer, PeerInfo] = (0 to 5).toList.map((peerId _).andThen(getPeer)).fproduct(getPeerInfo(_)).toMap
     val defaultPeer: Peer = peerByNumber(0)
 
     val etcPeerManager: TestProbe = TestProbe()
@@ -59,6 +58,7 @@ trait RegularSyncFixtures { self: Matchers with AsyncMockFactory =>
     val pendingTransactionsManager: TestProbe = TestProbe()
     val checkpointBlockGenerator: CheckpointBlockGenerator = new CheckpointBlockGenerator()
     val peersClient: TestProbe = TestProbe()
+    val blacklist: CacheBasedBlacklist = CacheBasedBlacklist.empty(100)
 
     lazy val regularSync: ActorRef = system.actorOf(
       RegularSync
@@ -69,6 +69,7 @@ trait RegularSyncFixtures { self: Matchers with AsyncMockFactory =>
           ledger,
           blockchain,
           validators.blockValidator,
+          blacklist,
           syncConfig,
           ommersPool.ref,
           pendingTransactionsManager.ref,

src/test/scala/io/iohk/ethereum/blockchain/sync/regular/RegularSyncSpec.scala

@@ -7,6 +7,7 @@ import akka.util.ByteString
 import cats.data.NonEmptyList
 import cats.effect.Resource
 import cats.syntax.traverse._
+import io.iohk.ethereum.blockchain.sync.Blacklist.BlacklistReason
 import io.iohk.ethereum.blockchain.sync.SyncProtocol.Status
 import io.iohk.ethereum.blockchain.sync.SyncProtocol.Status.Progress
 import io.iohk.ethereum.blockchain.sync.regular.RegularSync.NewCheckpoint
@@ -107,8 +108,8 @@ class RegularSyncSpec
         regularSync ! SyncProtocol.Start
 
         peersClient.expectMsgType[PeersClient.Request[GetBlockHeaders]]
-        peersClient.reply(PeersClient.RequestFailed(defaultPeer, "a random reason"))
-        peersClient.expectMsg(PeersClient.BlacklistPeer(defaultPeer.id, "a random reason"))
+        peersClient.reply(PeersClient.RequestFailed(defaultPeer, BlacklistReason.RegularSyncRequestFailed("a random reason")))
+        peersClient.expectMsg(PeersClient.BlacklistPeer(defaultPeer.id, BlacklistReason.RegularSyncRequestFailed("a random reason")))
       })
 
       //TODO: To be re-enabled with ETCM-370
@@ -231,7 +232,6 @@ class RegularSyncSpec
               defaultPeer.id
             )
           )
-
           awaitCond(ledger.bestBlock == alternativeBlocks.last, 5.seconds)
         }
       )