Refactoring and changed default supervisor strategy on PeerActor

Author: Nicolas Tallar

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

@@ -2,6 +2,7 @@ package io.iohk.ethereum.network
 
 import java.net.{InetSocketAddress, URI}
 
+import akka.actor.SupervisorStrategy.Stop
 import io.iohk.ethereum.network.PeerManagerActor.PeerConfiguration
 import akka.actor._
 import akka.agent.Agent
@@ -42,6 +43,11 @@ class PeerActor[R <: HandshakeResult](
   import PeerActor._
   import context.{dispatcher, system}
 
+  override val supervisorStrategy: OneForOneStrategy =
+    OneForOneStrategy() {
+      case _ => Stop
+    }
+
   def scheduler: Scheduler = externalSchedulerOpt getOrElse system.scheduler
 
   val peerId: PeerId = PeerId(self.path.name)

src/main/scala/io/iohk/ethereum/network/rlpx/RLPxConnectionHandler.scala

@@ -82,8 +82,7 @@ class RLPxConnectionHandler(
             (responsePacket, result, remainingData)
           }
           lazy val maybePostEIP8Result = Try {
-            val encryptedPayloadSize = ByteUtils.bigEndianToShort(data.take(2).toArray)
-            val (packetData, remainingData) = data.splitAt(encryptedPayloadSize + 2)
+            val (packetData, remainingData) = decodeV4Packet(data)
             val (responsePacket, result) = handshaker.handleInitialMessageV4(packetData)
             (responsePacket, result, remainingData)
           }
@@ -110,8 +109,7 @@ class RLPxConnectionHandler(
             (result, remainingData)
           }
           val maybePostEIP8Result = Try {
-            val size = ByteUtils.bigEndianToShort(data.take(2).toArray)
-            val (packetData, remainingData) = data.splitAt(size + 2)
+            val (packetData, remainingData) = decodeV4Packet(data)
             val result = handshaker.handleResponseMessageV4(packetData)
             (result, remainingData)
           }
@@ -124,6 +122,18 @@ class RLPxConnectionHandler(
           }
       }
 
+    /**
+      * Decode V4 packet
+      *
+      * @param data, includes both the V4 packet with bytes from next messages
+      * @return data of the packet and the remaining data
+      */
+    private def decodeV4Packet(data: ByteString): (ByteString, ByteString) =  {
+      val encryptedPayloadSize = ByteUtils.bigEndianToShort(data.take(2).toArray)
+      val (packetData, remainingData) = data.splitAt(encryptedPayloadSize + 2)
+      packetData -> remainingData
+    }
+
     def handleTimeout: Receive = {
       case AuthHandshakeTimeout =>
         log.warning(s"[Stopping Connection] Auth handshake timeout for peer $peerId")