[ETCM-841] Apply PR remarks

Author: dzajkowski

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

@@ -104,7 +104,7 @@ class RLPxConnectionHandler(
 
           case Failure(ex) =>
             log.debug(
-              s"[Stopping Connection] Init AuthHandshaker message handling failed for peer {} due to {}",
+              "[Stopping Connection] Init AuthHandshaker message handling failed for peer {} due to {}",
               peerId,
               ex.getMessage
             )
@@ -132,7 +132,7 @@ class RLPxConnectionHandler(
 
           case Failure(ex) =>
             log.debug(
-              s"[Stopping Connection] Response AuthHandshaker message handling failed for peer {} due to {}",
+              "[Stopping Connection] Response AuthHandshaker message handling failed for peer {} due to {}",
               peerId,
               ex.getMessage
             )
@@ -154,25 +154,25 @@ class RLPxConnectionHandler(
     }
 
     def handleTimeout: Receive = { case AuthHandshakeTimeout =>
-      log.debug(s"[Stopping Connection] Auth handshake timeout for peer {}", peerId)
+      log.debug("[Stopping Connection] Auth handshake timeout for peer {}", peerId)
       context.parent ! ConnectionFailed
       context stop self
     }
 
     def processHandshakeResult(result: AuthHandshakeResult, remainingData: ByteString): Unit =
       result match {
         case AuthHandshakeSuccess(secrets, remotePubKey) =>
-          log.debug(s"Auth handshake succeeded for peer {}", peerId)
+          log.debug("Auth handshake succeeded for peer {}", peerId)
           context.parent ! ConnectionEstablished(remotePubKey)
           // following the specification at https://github.com/ethereum/devp2p/blob/master/rlpx.md#initial-handshake
           // point 6 indicates that the next messages needs to be initial 'Hello'
           // Unfortunately it is hard to figure out the proper order for messages to be handled in.
           // FrameCodec assumes that bytes will arrive in the expected order
           // To alleviate potential lapses in order each chunk of data needs to be passed to FrameCodec immediately
-          extractHello(extractor(secrets), remainingData, None, 0)
+          extractHello(extractor(secrets), remainingData)
 
         case AuthHandshakeError =>
-          log.debug(s"[Stopping Connection] Auth handshake failed for peer {}", peerId)
+          log.debug("[Stopping Connection] Auth handshake failed for peer {}", peerId)
           context.parent ! ConnectionFailed
           context stop self
       }
@@ -201,7 +201,7 @@ class RLPxConnectionHandler(
 
         case AckTimeout(ackSeqNumber) if cancellableAckTimeout.exists(_.seqNumber == ackSeqNumber) =>
           cancellableAckTimeout.foreach(_.cancellable.cancel())
-          log.error(s"[Stopping Connection] Sending 'Hello' to {} failed", peerId)
+          log.error("[Stopping Connection] Sending 'Hello' to {} failed", peerId)
           context stop self
         case Received(data) =>
           extractHello(extractor, data, cancellableAckTimeout, seqNumber)
@@ -210,8 +210,8 @@ class RLPxConnectionHandler(
     private def extractHello(
         extractor: HelloCodec,
         data: ByteString,
-        cancellableAckTimeout: Option[CancellableAckTimeout],
-        seqNumber: Int
+        cancellableAckTimeout: Option[CancellableAckTimeout] = None,
+        seqNumber: Int = 0
     ): Unit = {
       extractor.readHello(data) match {
         case Some((hello, restFrames)) =>
@@ -229,12 +229,12 @@ class RLPxConnectionHandler(
                 seqNumber = seqNumber
               )
             case None =>
-              log.debug(s"[Stopping Connection] Unable to negotiate protocol with {}", peerId)
+              log.debug("[Stopping Connection] Unable to negotiate protocol with {}", peerId)
               context.parent ! ConnectionFailed
               context stop self
           }
         case None =>
-          log.debug(s"[Stopping Connection] Did not find 'Hello' in message from {}", peerId)
+          log.debug("[Stopping Connection] Did not find 'Hello' in message from {}", peerId)
           context become awaitInitialHello(extractor, cancellableAckTimeout, seqNumber)
       }
     }
@@ -255,7 +255,7 @@ class RLPxConnectionHandler(
         context.parent ! MessageReceived(message)
 
       case Failure(ex) =>
-        log.info(s"Cannot decode message from {}, because of {}", peerId, ex.getMessage)
+        log.info("Cannot decode message from {}, because of {}", peerId, ex.getMessage)
         // break connection in case of failed decoding, to avoid attack which would send us garbage
         context stop self
     }
@@ -303,7 +303,7 @@ class RLPxConnectionHandler(
 
         case AckTimeout(ackSeqNumber) if cancellableAckTimeout.exists(_.seqNumber == ackSeqNumber) =>
           cancellableAckTimeout.foreach(_.cancellable.cancel())
-          log.debug(s"[Stopping Connection] Write to {} failed", peerId)
+          log.debug("[Stopping Connection] Write to {} failed", peerId)
           context stop self
       }
     }
@@ -325,7 +325,7 @@ class RLPxConnectionHandler(
     ): Unit = {
       val out = messageCodec.encodeMessage(messageToSend)
       connection ! Write(out, Ack)
-      log.debug(s"Sent message: {} to {}", messageToSend.underlyingMsg.toShortString, peerId)
+      log.debug("Sent message: {} to {}", messageToSend.underlyingMsg.toShortString, peerId)
 
       val timeout = system.scheduler.scheduleOnce(rlpxConfiguration.waitForTcpAckTimeout, self, AckTimeout(seqNumber))
       context become handshaked(
@@ -349,7 +349,7 @@ class RLPxConnectionHandler(
 
     def handleWriteFailed: Receive = { case CommandFailed(cmd: Write) =>
       log.debug(
-        s"[Stopping Connection] Write to peer {} failed, trying to send {}",
+        "[Stopping Connection] Write to peer {} failed, trying to send {}",
         peerId,
         Hex.toHexString(cmd.data.toArray[Byte])
       )
@@ -358,10 +358,10 @@ class RLPxConnectionHandler(
 
     def handleConnectionClosed: Receive = { case msg: ConnectionClosed =>
       if (msg.isPeerClosed) {
-        log.debug(s"[Stopping Connection] Connection with {} closed by peer", peerId)
+        log.debug("[Stopping Connection] Connection with {} closed by peer", peerId)
       }
       if (msg.isErrorClosed) {
-        log.debug(s"[Stopping Connection] Connection with {} closed because of error {}", peerId, msg.getErrorCause)
+        log.debug("[Stopping Connection] Connection with {} closed because of error {}", peerId, msg.getErrorCause)
       }
 
       context stop self