ETCM-167: Auto-derive RLP for Node.Address.

Author: aakoshh

src/main/scala/io/iohk/ethereum/network/discovery/codecs/RLPCodecs.scala

@@ -2,7 +2,7 @@ package io.iohk.ethereum.network.discovery.codecs
 
 import io.iohk.scalanet.discovery.ethereum.Node
 import io.iohk.scalanet.discovery.ethereum.v4.Payload
-import io.iohk.ethereum.rlp.{RLPList, RLPCodec}
+import io.iohk.ethereum.rlp.RLPCodec
 import io.iohk.ethereum.rlp.RLPImplicits._
 import io.iohk.ethereum.rlp.RLPImplicitConversions._
 import io.iohk.ethereum.rlp.RLPImplicitDerivations._
@@ -14,14 +14,17 @@ object RLPCodecs {
 
   implicit val policy: DerivationPolicy = DerivationPolicy(omitTrailingOptionals = true)
 
+  implicit val inetAddressRLPCodec: RLPCodec[InetAddress] =
+    RLPCodec.instance[InetAddress](
+      ip => ip.getAddress,
+      // Implicit conversion to `Array[Byte]`
+      { case rlp => InetAddress.getByAddress(rlp) }
+    )
+
   implicit val nodeAddressRLPCodec: RLPCodec[Node.Address] =
-    RLPCodec.instance[Node.Address](
-      { case Node.Address(ip, udpPort, tcpPort) =>
-        RLPList(ip.getAddress, udpPort, tcpPort)
-      },
-      { case RLPList(ip, udpPort, tcpPort, _*) =>
-        Node.Address(InetAddress.getByAddress(ip), udpPort, tcpPort)
-      }
+    RLPCodec[Node.Address](
+      deriveLabelledGenericRLPListEncoder,
+      deriveLabelledGenericRLPListDecoder
     )
 
   implicit val pingRLPCodec: RLPCodec[Payload.Ping] =