[ETCM-355] Remove MessageDecoders.fromBytesUnsafe

Author: lukasz-golebiewski

src/main/scala/io/iohk/ethereum/network/p2p/Message.scala

@@ -27,11 +27,6 @@ trait MessageDecoder extends Logger { self =>
 
   def fromBytes(`type`: Int, payload: Array[Byte]): Either[DecodingError, Message]
 
-  def fromBytesUnsafe(`type`: Int, payload: Array[Byte]): Message = self.fromBytes(`type`, payload) match {
-    case Left(err) => throw err
-    case Right(res) => res
-  }
-
   def orElse(otherMessageDecoder: MessageDecoder): MessageDecoder = new MessageDecoder {
     override def fromBytes(`type`: Int, payload: Array[Byte]): Either[DecodingError, Message] =
     self.fromBytes(`type`, payload).leftFlatMap { err =>

src/test/scala/io/iohk/ethereum/network/p2p/MessageDecodersSpec.scala

@@ -46,7 +46,7 @@ class MessageDecodersSpec extends AnyFlatSpec with Matchers with SecureRandomBui
         )
       )
     )
-    NetworkMessageDecoder.fromBytesUnsafe(WireProtocol.Hello.code, helloBytes) shouldBe hello
+    NetworkMessageDecoder.fromBytes(WireProtocol.Hello.code, helloBytes) shouldBe Right(hello)
   }
 
   it should "decode NewBlockHashes message for all supported versions of protocol" in {

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

@@ -176,7 +176,7 @@ class MessagesSerializationSpec extends AnyWordSpec with ScalaCheckPropertyCheck
   //scalastyle:on
 
   def verify[T](msg: T, encode: T => Array[Byte], code: Int, version: Capability): Unit =
-    messageDecoder(version).fromBytesUnsafe(code, encode(msg)) shouldEqual msg
+    messageDecoder(version).fromBytes(code, encode(msg)) shouldEqual Right(msg)
 
   private def messageDecoder(version: Capability) =
     NetworkMessageDecoder.orElse(EthereumMessageDecoder.ethMessageDecoder(version))

src/test/scala/io/iohk/ethereum/network/p2p/messages/NodeDataSpec.scala

@@ -90,7 +90,7 @@ class NodeDataSpec extends AnyFlatSpec with Matchers {
   it should "be decoded properly" in {
     val result = EthereumMessageDecoder
       .ethMessageDecoder(ProtocolVersions.ETH63)
-      .fromBytesUnsafe(Codes.NodeDataCode, encode(encodedNodeData))
+      .fromBytes(Codes.NodeDataCode, encode(encodedNodeData)).getOrElse(fail("Should have decoded NodeData"))
 
     result match {
       case m: NodeData =>
@@ -106,7 +106,7 @@ class NodeDataSpec extends AnyFlatSpec with Matchers {
   it should "be decoded previously encoded value" in {
     EthereumMessageDecoder
       .ethMessageDecoder(ProtocolVersions.ETH63)
-      .fromBytesUnsafe(Codes.NodeDataCode, nodeData.toBytes) shouldBe nodeData
+      .fromBytes(Codes.NodeDataCode, nodeData.toBytes) shouldBe Right(nodeData)
   }
 
   it should "decode branch node with values in leafs that looks like RLP list" in {

src/test/scala/io/iohk/ethereum/network/p2p/messages/ReceiptsSpec.scala

@@ -57,15 +57,15 @@ class ReceiptsSpec extends AnyFlatSpec with Matchers {
   it should "decode receipts" in {
     EthereumMessageDecoder
       .ethMessageDecoder(ProtocolVersions.ETH63)
-      .fromBytesUnsafe(
+      .fromBytes(
         Codes.ReceiptsCode,
         encode(encodedReceipts)
-      ) shouldBe receipts
+      ) shouldBe Right(receipts)
   }
 
   it should "decode encoded receipts" in {
     EthereumMessageDecoder
       .ethMessageDecoder(ProtocolVersions.ETH63)
-      .fromBytesUnsafe(Codes.ReceiptsCode, receipts.toBytes) shouldBe receipts
+      .fromBytes(Codes.ReceiptsCode, receipts.toBytes) shouldBe Right(receipts)
   }
 }