From 4be5c34ad24eabd64f8a35e61cd09b941ac6ef70 Mon Sep 17 00:00:00 2001 From: Pierre-Marie Padiou Date: Thu, 2 Apr 2020 16:07:30 +0200 Subject: [PATCH] fixup! Split the `Peer` in two (#1347) (#1365) --- .../src/main/scala/fr/acinq/eclair/io/PeerConnection.scala | 4 ++-- .../test/scala/fr/acinq/eclair/io/PeerConnectionSpec.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/io/PeerConnection.scala b/eclair-core/src/main/scala/fr/acinq/eclair/io/PeerConnection.scala index 94d2b097c..b0f8d942c 100644 --- a/eclair-core/src/main/scala/fr/acinq/eclair/io/PeerConnection.scala +++ b/eclair-core/src/main/scala/fr/acinq/eclair/io/PeerConnection.scala @@ -87,7 +87,7 @@ class PeerConnection(nodeParams: NodeParams, switchboard: ActorRef, router: Acto import d.pendingAuth.address log.info(s"connection authenticated with $remoteNodeId@${address.getHostString}:${address.getPort} direction=${if (d.pendingAuth.outgoing) "outgoing" else "incoming"}") Metrics.PeerConnectionsConnecting.withTag(Tags.ConnectionState, Tags.ConnectionStates.Authenticated).increment() - switchboard ! Authenticated(self, remoteNodeId, address, d.pendingAuth.outgoing, d.pendingAuth.origin_opt) + switchboard ! Authenticated(self, remoteNodeId) goto(BEFORE_INIT) using BeforeInitData(remoteNodeId, d.pendingAuth, d.transport) case Event(AuthTimeout, _) => @@ -484,7 +484,7 @@ object PeerConnection { case class PendingAuth(connection: ActorRef, remoteNodeId_opt: Option[PublicKey], address: InetSocketAddress, origin_opt: Option[ActorRef], transport_opt: Option[ActorRef] = None) { def outgoing: Boolean = remoteNodeId_opt.isDefined // if this is an outgoing connection, we know the node id in advance } - case class Authenticated(peerConnection: ActorRef, remoteNodeId: PublicKey, address: InetSocketAddress, outgoing: Boolean, origin_opt: Option[ActorRef]) + case class Authenticated(peerConnection: ActorRef, remoteNodeId: PublicKey) case class InitializeConnection(peer: ActorRef) case class ConnectionReady(peerConnection: ActorRef, remoteNodeId: PublicKey, address: InetSocketAddress, outgoing: Boolean, localInit: wire.Init, remoteInit: wire.Init) diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/io/PeerConnectionSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/io/PeerConnectionSpec.scala index 560fefdb8..ed89863f4 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/io/PeerConnectionSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/io/PeerConnectionSpec.scala @@ -72,7 +72,7 @@ class PeerConnectionSpec extends TestkitBaseClass with StateTestsHelperMethods { val probe = TestProbe() probe.send(peerConnection, PeerConnection.PendingAuth(connection.ref, Some(remoteNodeId), address, origin_opt = None, transport_opt = Some(transport.ref))) transport.send(peerConnection, TransportHandler.HandshakeCompleted(remoteNodeId)) - switchboard.expectMsg(PeerConnection.Authenticated(peerConnection, remoteNodeId, address, outgoing = true, origin_opt = None)) + switchboard.expectMsg(PeerConnection.Authenticated(peerConnection, remoteNodeId)) probe.send(peerConnection, PeerConnection.InitializeConnection(peer.ref)) transport.expectMsgType[TransportHandler.Listener] val localInit = transport.expectMsgType[wire.Init]