Merge remote-tracking branch 'origin/phase/release2_0' into feature/a…

…utomate_json_rpc_tests
input-output-hk · Sep 17, 2018 · bd0ed31 · bd0ed31
2 parents ddbb6d8 + 7c13ced
commit bd0ed31
Show file tree

Hide file tree

Showing 3 changed files with 329 additions and 298 deletions.
diff --git a/src/main/scala/io/iohk/ethereum/network/PeerActor.scala b/src/main/scala/io/iohk/ethereum/network/PeerActor.scala
@@ -1,22 +1,22 @@
 package io.iohk.ethereum.network
 
-import java.net.{InetSocketAddress, URI}
+import java.net.{ InetSocketAddress, URI }
 
 import akka.actor.SupervisorStrategy.Escalate
-import io.iohk.ethereum.network.PeerManagerActor.PeerConfiguration
 import akka.actor._
 import akka.util.ByteString
-import io.iohk.ethereum.network.p2p._
-import io.iohk.ethereum.network.p2p.messages.WireProtocol._
-import io.iohk.ethereum.network.p2p.messages.Versions
-import io.iohk.ethereum.network.rlpx.{AuthHandshaker, RLPxConnectionHandler}
 import io.iohk.ethereum.network.PeerActor.Status._
-import io.iohk.ethereum.network.PeerEventBusActor.PeerEvent.{MessageFromPeer, PeerHandshakeSuccessful}
+import io.iohk.ethereum.network.PeerEventBusActor.PeerEvent.{ MessageFromPeer, PeerHandshakeSuccessful }
 import io.iohk.ethereum.network.PeerEventBusActor.Publish
+import io.iohk.ethereum.network.PeerManagerActor.PeerConfiguration
 import io.iohk.ethereum.network.handshaker.Handshaker
-import io.iohk.ethereum.network.handshaker.Handshaker.HandshakeComplete.{HandshakeFailure, HandshakeSuccess}
-import io.iohk.ethereum.network.handshaker.Handshaker.{HandshakeResult, NextMessage}
+import io.iohk.ethereum.network.handshaker.Handshaker.HandshakeComplete.{ HandshakeFailure, HandshakeSuccess }
+import io.iohk.ethereum.network.handshaker.Handshaker.{ HandshakeResult, NextMessage }
+import io.iohk.ethereum.network.p2p._
+import io.iohk.ethereum.network.p2p.messages.Versions
+import io.iohk.ethereum.network.p2p.messages.WireProtocol._
 import io.iohk.ethereum.network.rlpx.RLPxConnectionHandler.RLPxConfiguration
+import io.iohk.ethereum.network.rlpx.{ AuthHandshaker, RLPxConnectionHandler }
 import org.bouncycastle.util.encoders.Hex
 
 
@@ -39,7 +39,7 @@ class PeerActor[R <: HandshakeResult](
   extends Actor with ActorLogging with Stash {
 
   import PeerActor._
-  import context.{dispatcher, system}
+  import context.{ dispatcher, system }
 
   override val supervisorStrategy: OneForOneStrategy =
     OneForOneStrategy() {
@@ -154,7 +154,6 @@ class PeerActor[R <: HandshakeResult](
         val newTimeout = scheduler.scheduleOnce(timeoutTime, self, ResponseTimeout)
         context become processingHandshaking(handshaker, rlpxConnection, newTimeout, numRetries)
 
-
       case Left(HandshakeSuccess(handshakeResult)) =>
         rlpxConnection.uriOpt.foreach { uri =>knownNodesManager ! KnownNodesManager.AddKnownNode(uri) }
         context become new HandshakedPeer(rlpxConnection, handshakeResult).receive
@@ -246,10 +245,6 @@ class PeerActor[R <: HandshakeResult](
 
   class HandshakedPeer(rlpxConnection: RLPxConnection, handshakeResult: R) {
 
-    if (incomingConnection) {
-      context.parent ! IncomingConnectionHandshakeSuccess(peerId, peer)
-    }
-
     peerEventBus ! Publish(PeerHandshakeSuccessful(peer, handshakeResult))
 
     /**
@@ -313,13 +308,13 @@ object PeerActor {
 
   case class HandleConnection(connection: ActorRef, remoteAddress: InetSocketAddress)
 
-  case class IncomingConnectionHandshakeSuccess(peerId: PeerId, peer: Peer)
+  case class IncomingConnectionHandshakeSuccess(peer: Peer)
 
   case class ConnectTo(uri: URI)
 
   case class SendMessage(message: MessageSerializable)
 
-  case class PeerClosedConnection(peerAddress: String, reason: Long)
+  case class PeerClosedConnection(peerHostAddress: String, reason: Long)
 
   private case object RetryConnectionTimeout