[ETCM-842] Apply PR remarks

Author: dzajkowski

Diff for: src/main/scala/io/iohk/ethereum/network/p2p/MessageDecoders.scala

@@ -27,7 +27,7 @@ object NetworkMessageDecoder extends MessageDecoder {
       case Ping.code => payload.toPing
       case Pong.code => payload.toPong
       case Hello.code => payload.toHello
-      case _ => throw new RuntimeException(s"Unknown message type: ${msgCode}")
+      case _ => throw new RuntimeException(s"Unknown message type: $msgCode")
     }
 
 }
@@ -51,7 +51,7 @@ object ETC64MessageDecoder extends MessageDecoder {
       case Codes.BlockBodiesCode => payload.toBlockBodies
       case Codes.BlockHashesFromNumberCode => payload.toBlockHashesFromNumber
       case Codes.SignedTransactionsCode => payload.toSignedTransactions
-      case _ => throw new RuntimeException(s"Unknown message type: ${msgCode}")
+      case _ => throw new RuntimeException(s"Unknown message type: $msgCode")
     }
   }
 }
@@ -75,7 +75,7 @@ object ETH63MessageDecoder extends MessageDecoder {
       case Codes.StatusCode => payload.toStatus
       case Codes.NewBlockCode => payload.toNewBlock
       case Codes.SignedTransactionsCode => payload.toSignedTransactions
-      case _ => throw new RuntimeException(s"Unknown message type: ${msgCode}")
+      case _ => throw new RuntimeException(s"Unknown message type: $msgCode")
     }
   }
 }

Diff for: src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala

@@ -24,7 +24,6 @@ import io.iohk.ethereum.network.EtcPeerManagerActor.PeerInfo
 import io.iohk.ethereum.network.PeerManagerActor.PeerConfiguration
 import io.iohk.ethereum.network.discovery.{DiscoveryConfig, DiscoveryServiceBuilder, PeerDiscoveryManager}
 import io.iohk.ethereum.network.handshaker.{EtcHandshaker, EtcHandshakerConfiguration, Handshaker}
-import io.iohk.ethereum.network.p2p.{EthereumMessageDecoder, NetworkMessageDecoder}
 import io.iohk.ethereum.network.rlpx.AuthHandshaker
 import io.iohk.ethereum.network.{PeerManagerActor, ServerActor, _}
 import io.iohk.ethereum.ommers.OmmersPool

Diff for: src/test/scala/io/iohk/ethereum/network/p2p/messages/MessagesSerializationSpec.scala

@@ -91,9 +91,9 @@ class MessagesSerializationSpec extends AnyWordSpec with ScalaCheckPropertyCheck
     }
   }
 
-  "support ETH61 messages as ETH63" when {
+  "ETH63" when {
     val version = ProtocolVersions.ETH63
-    "encoding and decoding NewBlockHashes" should {
+    "encoding and decoding ETH61.NewBlockHashes" should {
       "throw for unsupported message version" in {
         val msg = ETH61.NewBlockHashes(Seq(ByteString("23"), ByteString("10"), ByteString("36")))
         assertThrows[RuntimeException] {
@@ -108,11 +108,8 @@ class MessagesSerializationSpec extends AnyWordSpec with ScalaCheckPropertyCheck
         verify(msg, (m: BlockHashesFromNumber) => m.toBytes, Codes.BlockHashesFromNumberCode, version)
       }
     }
-  }
 
-  "support ETH62 messages as ETH63" when {
-    val version = ProtocolVersions.ETH63
-    "encoding and decoding NewBlockHashes" should {
+    "encoding and decoding ETH62.NewBlockHashes" should {
       "return same result" in {
         val msg = ETH62.NewBlockHashes(Seq(BlockHash(ByteString("hash1"), 1), BlockHash(ByteString("hash2"), 2)))
         verify(msg, (m: ETH62.NewBlockHashes) => m.toBytes, Codes.NewBlockHashesCode, version)