Skip to content

Commit 498e9f7

Browse files
robinrajurobinraju
authored
[ETCM-631] Create peerId from node's public key (#957)
* [ETCM-631] Create peerId from node's public key * [ETCM-631] Try to fix flaky it test
1 parent e1d275b commit 498e9f7

21 files changed

+96
-73
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ class FastSyncItSpec extends FlatSpecBase with Matchers with BeforeAndAfterAll {
208208
_ <- peer1.waitForFastSyncFinish()
209209
} yield {
210210
// Peer3 is blacklisted
211-
val blacklistedPeer = PeerId(s"${peer3.node.addr.getHostAddress}:${peer3.node.tcpPort}")
211+
val blacklistedPeer = PeerId(peer3.node.toUri.getUserInfo)
212212
val blacklistReason = peer1.blacklist.cache.getIfPresent(blacklistedPeer)
213213

214214
assert(peer1.blacklist.isBlacklisted(blacklistedPeer))
@@ -230,11 +230,11 @@ class FastSyncItSpec extends FlatSpecBase with Matchers with BeforeAndAfterAll {
230230

231231
_ <- peer1.connectToPeers(Set(peer2.node, peer3.node, peer4.node))
232232
_ <- peer1.startFastSync().delayExecution(50.milliseconds)
233-
_ <- peer2.importBlocksUntil(1200)(IdentityUpdate).startAndForget
233+
_ <- peer2.importBlocksUntil(1200)(IdentityUpdate)
234234
_ <- peer1.waitForFastSyncFinish()
235235
} yield {
236236
// Peer3 is blacklisted
237-
val blacklistedPeer = PeerId(s"${peer3.node.addr.getHostAddress}:${peer3.node.tcpPort}")
237+
val blacklistedPeer = PeerId(peer3.node.toUri.getUserInfo)
238238
val blacklistReason = peer1.blacklist.cache.getIfPresent(blacklistedPeer)
239239

240240
assert(peer1.blacklist.isBlacklisted(blacklistedPeer))

‎src/main/scala/io/iohk/ethereum/network/ConnectedPeers.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ case class ConnectedPeers(
5858
def promotePeerToHandshaked(peerAfterHandshake: Peer): ConnectedPeers = {
5959
if (peerAfterHandshake.incomingConnection)
6060
copy(
61-
incomingPendingPeers = incomingPendingPeers - peerAfterHandshake.id,
61+
incomingPendingPeers = incomingPendingPeers - PeerId.fromRef(peerAfterHandshake.ref),
6262
handshakedPeers = handshakedPeers + (peerAfterHandshake.id -> peerAfterHandshake)
6363
)
6464
else
6565
copy(
66-
outgoingPendingPeers = outgoingPendingPeers - peerAfterHandshake.id,
66+
outgoingPendingPeers = outgoingPendingPeers - PeerId.fromRef(peerAfterHandshake.ref),
6767
handshakedPeers = handshakedPeers + (peerAfterHandshake.id -> peerAfterHandshake)
6868
)
6969
}

‎src/main/scala/io/iohk/ethereum/network/Peer.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ object PeerId {
1313
}
1414

1515
final case class Peer(
16+
id: PeerId,
1617
remoteAddress: InetSocketAddress,
1718
ref: ActorRef,
1819
incomingConnection: Boolean,
1920
nodeId: Option[ByteString] = None,
2021
createTimeMillis: Long = System.currentTimeMillis
21-
) {
22-
// FIXME PeerId should be actual peerId i.e id derived form node public key
23-
def id: PeerId = PeerId.fromRef(ref)
24-
}
22+
)

‎src/main/scala/io/iohk/ethereum/network/PeerActor.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ class PeerActor[R <: HandshakeResult](
5050

5151
def scheduler: Scheduler = externalSchedulerOpt getOrElse system.scheduler
5252

53-
val peerId: PeerId = PeerId.fromRef(self)
54-
5553
override def receive: Receive = waitingForInitialCommand
5654

5755
def waitingForInitialCommand: Receive = stashMessages orElse {
@@ -200,7 +198,7 @@ class PeerActor[R <: HandshakeResult](
200198

201199
def handleTerminated(rlpxConnection: RLPxConnection, numRetries: Int, status: Status): Receive = {
202200
case Terminated(actor) if actor == rlpxConnection.ref =>
203-
log.debug(s"Underlying rlpx connection with peer $peerId closed")
201+
rlpxConnection.uriOpt.foreach(uri => log.debug(s"Underlying rlpx connection with peer ${uri.getUserInfo} closed"))
204202
rlpxConnection.uriOpt match {
205203
case Some(uri) if numRetries < peerConfiguration.connectMaxRetries =>
206204
scheduleConnectRetry(uri, numRetries + 1)
@@ -264,7 +262,8 @@ class PeerActor[R <: HandshakeResult](
264262

265263
class HandshakedPeer(remoteNodeId: ByteString, rlpxConnection: RLPxConnection, handshakeResult: R) {
266264

267-
val peer: Peer = Peer(peerAddress, self, incomingConnection, Some(remoteNodeId))
265+
val peerId = PeerId(Hex.toHexString(remoteNodeId.toArray))
266+
val peer: Peer = Peer(peerId, peerAddress, self, incomingConnection, Some(remoteNodeId))
268267
peerEventBus ! Publish(PeerHandshakeSuccessful(peer, handshakeResult))
269268

270269
/**
@@ -277,7 +276,7 @@ class PeerActor[R <: HandshakeResult](
277276

278277
case RLPxConnectionHandler.MessageReceived(message) =>
279278
MessageLogger.logMessage(peerId, message)
280-
peerEventBus ! Publish(MessageFromPeer(message, peer.id))
279+
peerEventBus ! Publish(MessageFromPeer(message, peerId))
281280

282281
case DisconnectPeer(reason) =>
283282
disconnectFromPeer(rlpxConnection, reason)

‎src/main/scala/io/iohk/ethereum/network/PeerManagerActor.scala

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,19 @@ class PeerManagerActor(
310310
): (Peer, ConnectedPeers) = {
311311
val ref = peerFactory(context, address, incomingConnection)
312312
context watch ref
313-
val pendingPeer = Peer(address, ref, incomingConnection, None, createTimeMillis = System.currentTimeMillis)
313+
314+
// The peerId is unknown for a pending peer, hence it is created from the PeerActor's path.
315+
// Upon successful handshake, the pending peer is updated with the actual peerId derived from
316+
// the Node's public key. See: ConnectedPeers#promotePeerToHandshaked
317+
val pendingPeer =
318+
Peer(
319+
PeerId.fromRef(ref),
320+
address,
321+
ref,
322+
incomingConnection,
323+
nodeId = None,
324+
createTimeMillis = System.currentTimeMillis
325+
)
314326

315327
val newConnectedPeers = connectedPeers.addNewPendingPeer(pendingPeer)
316328

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.iohk.ethereum.blockchain.sync
22

33
import java.net.InetSocketAddress
4-
54
import akka.actor.ActorSystem
65
import akka.testkit.{TestKit, TestProbe}
76
import io.iohk.ethereum.blockchain.sync.regular.BlockBroadcast
@@ -11,7 +10,7 @@ import io.iohk.ethereum.network.EtcPeerManagerActor.{PeerInfo, RemoteStatus}
1110
import io.iohk.ethereum.network.p2p.messages.PV62.NewBlockHashes
1211
import io.iohk.ethereum.network.p2p.messages.PV64.NewBlock
1312
import io.iohk.ethereum.network.p2p.messages.{CommonMessages, PV62, ProtocolVersions}
14-
import io.iohk.ethereum.network.{EtcPeerManagerActor, Peer}
13+
import io.iohk.ethereum.network.{EtcPeerManagerActor, Peer, PeerId}
1514
import io.iohk.ethereum.{Fixtures, WithActorSystemShutDown}
1615
import org.scalatest.flatspec.AnyFlatSpecLike
1716
import org.scalatest.matchers.should.Matchers
@@ -114,11 +113,11 @@ class BlockBroadcastSpec
114113
NewBlock(Block(firstHeader, BlockBody(Nil, Nil)), initialPeerInfo.chainWeight.increaseTotalDifficulty(-2))
115114

116115
val peer2Probe = TestProbe()
117-
val peer2 = Peer(new InetSocketAddress("127.0.0.1", 0), peer2Probe.ref, false)
116+
val peer2 = Peer(PeerId("peer2"), new InetSocketAddress("127.0.0.1", 0), peer2Probe.ref, false)
118117
val peer3Probe = TestProbe()
119-
val peer3 = Peer(new InetSocketAddress("127.0.0.1", 0), peer3Probe.ref, false)
118+
val peer3 = Peer(PeerId("peer3"), new InetSocketAddress("127.0.0.1", 0), peer3Probe.ref, false)
120119
val peer4Probe = TestProbe()
121-
val peer4 = Peer(new InetSocketAddress("127.0.0.1", 0), peer4Probe.ref, false)
120+
val peer4 = Peer(PeerId("peer4"), new InetSocketAddress("127.0.0.1", 0), peer4Probe.ref, false)
122121

123122
//when
124123
val peers = Seq(peer, peer2, peer3, peer4)
@@ -166,6 +165,6 @@ class BlockBroadcastSpec
166165
)
167166

168167
val peerProbe = TestProbe()
169-
val peer = Peer(new InetSocketAddress("127.0.0.1", 0), peerProbe.ref, false)
168+
val peer = Peer(PeerId("peer"), new InetSocketAddress("127.0.0.1", 0), peerProbe.ref, false)
170169
}
171170
}

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package io.iohk.ethereum.blockchain.sync
22

33
import java.net.InetSocketAddress
4-
54
import akka.actor.ActorSystem
65
import akka.testkit.TestProbe
76
import akka.util.ByteString
87
import io.iohk.ethereum.domain.ChainWeight
98
import io.iohk.ethereum.network.EtcPeerManagerActor.{PeerInfo, RemoteStatus}
10-
import io.iohk.ethereum.network.Peer
9+
import io.iohk.ethereum.network.{Peer, PeerId}
1110
import io.iohk.ethereum.network.p2p.messages.ProtocolVersions
1211
import org.scalatest.flatspec.AnyFlatSpec
1312
import org.scalatest.matchers.should.Matchers
@@ -59,9 +58,9 @@ class PeersClientSpec extends AnyFlatSpec with Matchers with ScalaCheckPropertyC
5958
object Peers {
6059
implicit val system = ActorSystem("PeersClient_System")
6160

62-
val peer1 = Peer(new InetSocketAddress("127.0.0.1", 1), TestProbe().ref, false)
63-
val peer2 = Peer(new InetSocketAddress("127.0.0.1", 2), TestProbe().ref, false)
64-
val peer3 = Peer(new InetSocketAddress("127.0.0.1", 3), TestProbe().ref, false)
61+
val peer1 = Peer(PeerId("peer1"), new InetSocketAddress("127.0.0.1", 1), TestProbe().ref, false)
62+
val peer2 = Peer(PeerId("peer2"), new InetSocketAddress("127.0.0.1", 2), TestProbe().ref, false)
63+
val peer3 = Peer(PeerId("peer3"), new InetSocketAddress("127.0.0.1", 3), TestProbe().ref, false)
6564

6665
private val peerStatus = RemoteStatus(
6766
protocolVersion = ProtocolVersions.PV63,

‎src/test/scala/io/iohk/ethereum/blockchain/sync/PivotBlockSelectorSpec.scala

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.iohk.ethereum.blockchain.sync
22

33
import java.net.InetSocketAddress
4-
54
import akka.actor.{ActorRef, ActorSystem}
65
import akka.testkit.{TestKit, TestProbe}
76
import akka.util.ByteString
@@ -17,7 +16,7 @@ import io.iohk.ethereum.network.p2p.Message
1716
import io.iohk.ethereum.network.p2p.messages.CommonMessages.NewBlock
1817
import io.iohk.ethereum.network.p2p.messages.PV62._
1918
import io.iohk.ethereum.network.p2p.messages.{Codes, ProtocolVersions}
20-
import io.iohk.ethereum.network.{EtcPeerManagerActor, Peer}
19+
import io.iohk.ethereum.network.{EtcPeerManagerActor, Peer, PeerId}
2120
import io.iohk.ethereum.utils.Config.SyncConfig
2221
import io.iohk.ethereum.{Fixtures, WithActorSystemShutDown}
2322
import org.scalatest.BeforeAndAfter
@@ -565,10 +564,10 @@ class PivotBlockSelectorSpec
565564
val peer3TestProbe: TestProbe = TestProbe("peer3")(system)
566565
val peer4TestProbe: TestProbe = TestProbe("peer4")(system)
567566

568-
val peer1 = Peer(new InetSocketAddress("127.0.0.1", 0), peer1TestProbe.ref, false)
569-
val peer2 = Peer(new InetSocketAddress("127.0.0.2", 0), peer2TestProbe.ref, false)
570-
val peer3 = Peer(new InetSocketAddress("127.0.0.3", 0), peer3TestProbe.ref, false)
571-
val peer4 = Peer(new InetSocketAddress("127.0.0.4", 0), peer4TestProbe.ref, false)
567+
val peer1 = Peer(PeerId("peer1"), new InetSocketAddress("127.0.0.1", 0), peer1TestProbe.ref, false)
568+
val peer2 = Peer(PeerId("peer2"), new InetSocketAddress("127.0.0.2", 0), peer2TestProbe.ref, false)
569+
val peer3 = Peer(PeerId("peer3"), new InetSocketAddress("127.0.0.3", 0), peer3TestProbe.ref, false)
570+
val peer4 = Peer(PeerId("peer4"), new InetSocketAddress("127.0.0.4", 0), peer4TestProbe.ref, false)
572571

573572
val peer1Status =
574573
RemoteStatus(

‎src/test/scala/io/iohk/ethereum/blockchain/sync/StateSyncSpec.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,12 @@ class StateSyncSpec
166166

167167
val peersMap = (1 to 8).map { i =>
168168
(
169-
Peer(new InetSocketAddress("127.0.0.1", i), TestProbe(i.toString).ref, incomingConnection = false),
169+
Peer(
170+
PeerId(s"peer$i"),
171+
new InetSocketAddress("127.0.0.1", i),
172+
TestProbe(i.toString).ref,
173+
incomingConnection = false
174+
),
170175
initialPeerInfo
171176
)
172177
}.toMap

‎src/test/scala/io/iohk/ethereum/blockchain/sync/SyncStateDownloaderStateSpec.scala

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.iohk.ethereum.blockchain.sync
22

33
import java.net.InetSocketAddress
4-
54
import akka.actor.ActorSystem
65
import akka.testkit.{TestKit, TestProbe}
76
import akka.util.ByteString
@@ -16,7 +15,7 @@ import io.iohk.ethereum.blockchain.sync.fast.SyncStateSchedulerActor.{
1615
}
1716
import io.iohk.ethereum.blockchain.sync.fast.DownloaderState
1817
import io.iohk.ethereum.crypto.kec256
19-
import io.iohk.ethereum.network.Peer
18+
import io.iohk.ethereum.network.{Peer, PeerId}
2019
import io.iohk.ethereum.network.p2p.messages.PV63.NodeData
2120
import org.scalatest.BeforeAndAfterAll
2221
import org.scalatest.flatspec.AnyFlatSpecLike
@@ -237,10 +236,10 @@ class SyncStateDownloaderStateSpec
237236
val ref4 = TestProbe().ref
238237

239238
val initialState = DownloaderState(Map.empty, Map.empty)
240-
val peer1 = Peer(new InetSocketAddress("127.0.0.1", 1), ref1, incomingConnection = false)
241-
val peer2 = Peer(new InetSocketAddress("127.0.0.1", 2), ref2, incomingConnection = false)
242-
val peer3 = Peer(new InetSocketAddress("127.0.0.1", 3), ref3, incomingConnection = false)
243-
val notKnownPeer = Peer(new InetSocketAddress("127.0.0.1", 4), ref4, incomingConnection = false)
239+
val peer1 = Peer(PeerId("peer1"), new InetSocketAddress("127.0.0.1", 1), ref1, incomingConnection = false)
240+
val peer2 = Peer(PeerId("peer2"), new InetSocketAddress("127.0.0.1", 2), ref2, incomingConnection = false)
241+
val peer3 = Peer(PeerId("peer3"), new InetSocketAddress("127.0.0.1", 3), ref3, incomingConnection = false)
242+
val notKnownPeer = Peer(PeerId(""), new InetSocketAddress("127.0.0.1", 4), ref4, incomingConnection = false)
244243
val peers = NonEmptyList.fromListUnsafe(List(peer1, peer2, peer3))
245244
val potentialNodes = (1 to 100).map(i => ByteString(i)).toList
246245
val potentialNodesHashes = potentialNodes.map(node => kec256(node))

‎src/test/scala/io/iohk/ethereum/blockchain/sync/TestSyncPeers.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package io.iohk.ethereum.blockchain.sync
22
import java.net.InetSocketAddress
3-
43
import akka.actor.ActorSystem
54
import akka.testkit.TestProbe
65
import akka.util.ByteString
76
import io.iohk.ethereum.domain.ChainWeight
87
import io.iohk.ethereum.network.EtcPeerManagerActor.{PeerInfo, RemoteStatus}
9-
import io.iohk.ethereum.network.Peer
8+
import io.iohk.ethereum.network.{Peer, PeerId}
109
import io.iohk.ethereum.network.p2p.messages.ProtocolVersions
1110

1211
trait TestSyncPeers { self: TestSyncConfig =>
@@ -16,9 +15,9 @@ trait TestSyncPeers { self: TestSyncConfig =>
1615
val peer2TestProbe: TestProbe = TestProbe("peer2")(system)
1716
val peer3TestProbe: TestProbe = TestProbe("peer3")(system)
1817

19-
val peer1 = Peer(new InetSocketAddress("127.0.0.1", 0), peer1TestProbe.ref, false)
20-
val peer2 = Peer(new InetSocketAddress("127.0.0.2", 0), peer2TestProbe.ref, false)
21-
val peer3 = Peer(new InetSocketAddress("127.0.0.3", 0), peer3TestProbe.ref, false)
18+
val peer1 = Peer(PeerId("peer1"), new InetSocketAddress("127.0.0.1", 0), peer1TestProbe.ref, false)
19+
val peer2 = Peer(PeerId("peer2"), new InetSocketAddress("127.0.0.2", 0), peer2TestProbe.ref, false)
20+
val peer3 = Peer(PeerId("peer3"), new InetSocketAddress("127.0.0.3", 0), peer3TestProbe.ref, false)
2221

2322
val peer1Status =
2423
RemoteStatus(

‎src/test/scala/io/iohk/ethereum/blockchain/sync/fast/FastSyncBranchResolverActorSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ class FastSyncBranchResolverActorSpec
246246

247247
def peerId(number: Int): PeerId = PeerId(s"peer_$number")
248248
def getPeer(id: PeerId): Peer =
249-
Peer(new InetSocketAddress("127.0.0.1", 0), TestProbe(id.value).ref, incomingConnection = false)
249+
Peer(id, new InetSocketAddress("127.0.0.1", 0), TestProbe(id.value).ref, incomingConnection = false)
250250
def getPeerInfo(peer: Peer, protocolVersion: Int = ProtocolVersions.PV64): PeerInfo = {
251251
val status =
252252
RemoteStatus(

‎src/test/scala/io/iohk/ethereum/blockchain/sync/fast/FastSyncBranchResolverSpec.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import io.iohk.ethereum.{BlockHelpers, Fixtures}
66
import io.iohk.ethereum.blockchain.sync.fast.BinarySearchSupport._
77
import io.iohk.ethereum.blockchain.sync.fast.FastSyncBranchResolver.SearchState
88
import io.iohk.ethereum.domain.{Block, BlockHeader, Blockchain, BlockchainImpl}
9-
import io.iohk.ethereum.network.Peer
9+
import io.iohk.ethereum.network.{Peer, PeerId}
1010
import org.scalamock.scalatest.MockFactory
1111
import org.scalatest.matchers.must.Matchers
1212
import org.scalatest.wordspec.AnyWordSpec
@@ -169,7 +169,7 @@ class FastSyncBranchResolverSpec extends AnyWordSpec with Matchers with MockFact
169169
val blocksSavedInPeer: List[Block] =
170170
commonBlocks :++ BlockHelpers.generateChain(ourBestBlock + 1 - highestCommonBlock, commonBlocks.last)
171171

172-
val dummyPeer = Peer(new InetSocketAddress("foo", 1), ActorRef.noSender, false, None, 0)
172+
val dummyPeer = Peer(PeerId("dummyPeer"), new InetSocketAddress("foo", 1), ActorRef.noSender, false, None, 0)
173173

174174
val initialSearchState = SearchState(1, 10, dummyPeer)
175175
val ours = blocksSaved.map(b => (b.number, b)).toMap
@@ -245,7 +245,7 @@ class FastSyncBranchResolverSpec extends AnyWordSpec with Matchers with MockFact
245245
val blocksSaved: List[Block] = BlockHelpers.generateChain(8, BlockHelpers.genesis)
246246
val blocksSavedInPeer: List[Block] = BlockHelpers.generateChain(8, BlockHelpers.genesis)
247247

248-
val dummyPeer = Peer(new InetSocketAddress("foo", 1), ActorRef.noSender, false, None, 0)
248+
val dummyPeer = Peer(PeerId("dummyPeer"), new InetSocketAddress("foo", 1), ActorRef.noSender, false, None, 0)
249249

250250
val initialSearchState = SearchState(1, 8, dummyPeer)
251251
val ours = blocksSaved.map(b => (b.number, b)).toMap

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import io.iohk.ethereum.blockchain.sync.{PeersClient, TestSyncConfig}
1212
import io.iohk.ethereum.checkpointing.CheckpointingTestHelpers
1313
import io.iohk.ethereum.consensus.blocks.CheckpointBlockGenerator
1414
import io.iohk.ethereum.domain.{Block, ChainWeight, Checkpoint, HeadersSeq}
15-
import io.iohk.ethereum.network.Peer
15+
import io.iohk.ethereum.network.{Peer, PeerId}
1616
import io.iohk.ethereum.network.PeerEventBusActor.PeerEvent.MessageFromPeer
1717
import io.iohk.ethereum.network.PeerEventBusActor.SubscriptionClassifier.MessageClassifier
1818
import io.iohk.ethereum.network.PeerEventBusActor.{PeerSelector, Subscribe}
@@ -519,7 +519,7 @@ class BlockFetcherSpec
519519
)
520520

521521
val fakePeerActor: TestProbe = TestProbe()
522-
val fakePeer = Peer(new InetSocketAddress("127.0.0.1", 9000), fakePeerActor.ref, false)
522+
val fakePeer = Peer(PeerId("fakePeer"), new InetSocketAddress("127.0.0.1", 9000), fakePeerActor.ref, false)
523523

524524
lazy val blockFetcher = system.actorOf(
525525
BlockFetcher

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ trait RegularSyncFixtures { self: Matchers with AsyncMockFactory =>
9898
def peerId(number: Int): PeerId = PeerId(s"peer_$number")
9999

100100
def getPeer(id: PeerId): Peer =
101-
Peer(new InetSocketAddress("127.0.0.1", 0), TestProbe(id.value).ref, incomingConnection = false)
101+
Peer(id, new InetSocketAddress("127.0.0.1", 0), TestProbe(id.value).ref, incomingConnection = false)
102102

103103
def getPeerInfo(peer: Peer, protocolVersion: Int = ProtocolVersions.PV64): PeerInfo = {
104104
val status =

‎src/test/scala/io/iohk/ethereum/jsonrpc/DebugServiceSpec.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package io.iohk.ethereum.jsonrpc
22

33
import java.net.InetSocketAddress
4-
54
import akka.actor.ActorSystem
65
import akka.testkit.{TestKit, TestProbe}
76
import io.iohk.ethereum.domain.ChainWeight
87
import io.iohk.ethereum.jsonrpc.DebugService.{ListPeersInfoRequest, ListPeersInfoResponse}
98
import io.iohk.ethereum.network.EtcPeerManagerActor.{PeerInfo, RemoteStatus}
109
import io.iohk.ethereum.network.PeerManagerActor.Peers
1110
import io.iohk.ethereum.network.p2p.messages.ProtocolVersions
12-
import io.iohk.ethereum.network.{EtcPeerManagerActor, Peer, PeerActor, PeerManagerActor}
11+
import io.iohk.ethereum.network.{EtcPeerManagerActor, Peer, PeerActor, PeerId, PeerManagerActor}
1312
import io.iohk.ethereum.{Fixtures, WithActorSystemShutDown}
1413
import monix.execution.Scheduler.Implicits.global
1514
import org.scalamock.scalatest.MockFactory
@@ -79,7 +78,7 @@ class DebugServiceSpec
7978
bestBlockHash = peerStatus.bestHash
8079
)
8180
val peer1Probe = TestProbe()
82-
val peer1 = Peer(new InetSocketAddress("127.0.0.1", 1), peer1Probe.ref, false)
81+
val peer1 = Peer(PeerId("peer1"), new InetSocketAddress("127.0.0.1", 1), peer1Probe.ref, false)
8382
val peer1Info: PeerInfo = initialPeerInfo.withForkAccepted(false)
8483
}
8584
}

‎src/test/scala/io/iohk/ethereum/jsonrpc/NetServiceSpec.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ package io.iohk.ethereum.jsonrpc
22

33
import java.net.InetSocketAddress
44
import java.util.concurrent.atomic.AtomicReference
5-
65
import akka.actor.ActorSystem
76
import akka.testkit.TestProbe
87
import io.iohk.ethereum.jsonrpc.NetService._
98
import io.iohk.ethereum.security.SecureRandomBuilder
10-
import io.iohk.ethereum.network.{Peer, PeerActor, PeerManagerActor}
9+
import io.iohk.ethereum.network.{Peer, PeerActor, PeerId, PeerManagerActor}
1110
import io.iohk.ethereum.utils.{NodeStatus, ServerStatus}
1211
import io.iohk.ethereum.{NormalPatience, crypto}
1312
import monix.execution.Scheduler.Implicits.global
@@ -28,9 +27,9 @@ class NetServiceSpec extends AnyFlatSpec with Matchers with ScalaFutures with No
2827
peerManager.reply(
2928
PeerManagerActor.Peers(
3029
Map(
31-
Peer(new InetSocketAddress(1), testRef, false) -> PeerActor.Status.Handshaked,
32-
Peer(new InetSocketAddress(2), testRef, false) -> PeerActor.Status.Handshaked,
33-
Peer(new InetSocketAddress(3), testRef, false) -> PeerActor.Status.Connecting
30+
Peer(PeerId("peer1"), new InetSocketAddress(1), testRef, false) -> PeerActor.Status.Handshaked,
31+
Peer(PeerId("peer2"), new InetSocketAddress(2), testRef, false) -> PeerActor.Status.Handshaked,
32+
Peer(PeerId("peer3"), new InetSocketAddress(3), testRef, false) -> PeerActor.Status.Connecting
3433
)
3534
)
3635
)

0 commit comments

Comments
 (0)