Delete unnecessary DTOs

* Delete PeerExchangePeerInfoPB
* Delete WakuPeerRecordPB

Author: fcecin

logos_delivery/waku/waku_peer_exchange/rpc.nim

@@ -1,4 +1,4 @@
-import results
+import results, protobuf_serialization
 
 type
   PeerExchangeResponseStatusCode* {.pure.} = enum
@@ -10,8 +10,9 @@ type
     SERVICE_UNAVAILABLE = uint32(503)
     DIAL_FAILURE = uint32(599)
 
-  PeerExchangePeerInfo* = object
-    enr*: seq[byte] # RLP encoded ENR: https://eips.ethereum.org/EIPS/eip-778
+  PeerExchangePeerInfo* {.proto2.} = object
+    enr* {.fieldNumber: 1.}: seq[byte]
+      # RLP encoded ENR: https://eips.ethereum.org/EIPS/eip-778
 
   PeerExchangeRequest* = object
     numPeers*: uint64

logos_delivery/waku/waku_peer_exchange/rpc_codec.nim

@@ -1,18 +1,15 @@
 {.push raises: [].}
 
-import std/sequtils, results
+import results
 import protobuf_serialization, protobuf_serialization/pkg/results
 import ../common/protobuf, ./rpc
 
 type
-  PeerExchangePeerInfoPB {.proto2.} = object
-    enr {.fieldNumber: 1.}: Opt[seq[byte]]
-
   PeerExchangeRequestPB {.proto2.} = object
     numPeers {.fieldNumber: 1, pint.}: Opt[uint64]
 
   PeerExchangeResponsePB {.proto2.} = object
-    peerInfos {.fieldNumber: 1.}: seq[PeerExchangePeerInfoPB]
+    peerInfos {.fieldNumber: 1.}: seq[PeerExchangePeerInfo]
     statusCode {.fieldNumber: 10, pint.}: Opt[uint32]
     statusDesc {.fieldNumber: 11.}: Opt[string]
 
@@ -27,12 +24,6 @@ proc parse*(T: type PeerExchangeResponseStatusCode, status: uint32): T =
   else:
     PeerExchangeResponseStatusCode.UNKNOWN
 
-proc toPB(pi: PeerExchangePeerInfo): PeerExchangePeerInfoPB =
-  PeerExchangePeerInfoPB(enr: Opt.some(pi.enr))
-
-proc fromPB(pb: PeerExchangePeerInfoPB): PeerExchangePeerInfo =
-  PeerExchangePeerInfo(enr: pb.enr.get(@[]))
-
 proc toPB(req: PeerExchangeRequest): PeerExchangeRequestPB =
   PeerExchangeRequestPB(numPeers: Opt.some(req.numPeers))
 
@@ -41,13 +32,13 @@ proc fromPB(pb: PeerExchangeRequestPB): PeerExchangeRequest =
 
 proc toPB(res: PeerExchangeResponse): PeerExchangeResponsePB =
   PeerExchangeResponsePB(
-    peerInfos: res.peerInfos.mapIt(toPB(it)),
+    peerInfos: res.peerInfos,
     statusCode: Opt.some(uint32(ord(res.status_code))),
     statusDesc: res.status_desc,
   )
 
 proc fromPB(pb: PeerExchangeResponsePB): PeerExchangeResponse =
-  let peerInfos = pb.peerInfos.mapIt(fromPB(it))
+  let peerInfos = pb.peerInfos
   let statusCode =
     if pb.statusCode.isSome():
       PeerExchangeResponseStatusCode.parse(pb.statusCode.get())
@@ -64,7 +55,7 @@ proc encode*(rpc: PeerExchangeRequest): seq[byte] =
   Protobuf.encode(toPB(rpc))
 
 proc encode*(rpc: PeerExchangePeerInfo): seq[byte] =
-  Protobuf.encode(toPB(rpc))
+  Protobuf.encode(rpc)
 
 proc encode*(rpc: PeerExchangeResponse): seq[byte] =
   Protobuf.encode(toPB(rpc))
@@ -86,7 +77,7 @@ proc decodePeerExchangePeerInfo(
     buffer: seq[byte]
 ): ProtobufResult[PeerExchangePeerInfo] =
   try:
-    ok(fromPB(Protobuf.decode(buffer, PeerExchangePeerInfoPB)))
+    ok(Protobuf.decode(buffer, PeerExchangePeerInfo))
   except SerializationError:
     err(protobuf.ProtobufError(kind: ProtobufErrorKind.DecodeFailure))
 

logos_delivery/waku/waku_rendezvous/waku_peer_record.nim

@@ -4,18 +4,12 @@ import protobuf_serialization, protobuf_serialization/pkg/results
 import libp2p/[protocols/rendezvous, signed_envelope, multicodec, multiaddress, peerid]
 import ../common/protobuf
 
-type WakuPeerRecord* = object
+type WakuPeerRecord* {.proto2.} = object
   # Considering only mix as of now, but we can keep extending this to include all capabilities part of Waku ENR
-  peerId*: PeerId
-  seqNo*: uint64
-  addresses*: seq[MultiAddress]
-  mixKey*: string
-
-type WakuPeerRecordPB {.proto2.} = object
-  peerId {.fieldNumber: 1, ext, required.}: PeerId
-  seqNo {.fieldNumber: 2, pint, required.}: uint64
-  addresses {.fieldNumber: 3, ext.}: seq[MultiAddress]
-  mixKey {.fieldNumber: 4, required.}: string
+  peerId* {.fieldNumber: 1, ext, required.}: PeerId
+  seqNo* {.fieldNumber: 2, pint, required.}: uint64
+  addresses* {.fieldNumber: 3, ext.}: seq[MultiAddress]
+  mixKey* {.fieldNumber: 4, required.}: string
 
 proc payloadDomain*(T: typedesc[WakuPeerRecord]): string =
   $multiCodec("libp2p-custom-peer-record")
@@ -33,35 +27,24 @@ proc init*(
   WakuPeerRecord(peerId: peerId, seqNo: seqNo, addresses: addresses, mixKey: mixKey)
 
 proc decodeWakuPeerRecord(buffer: seq[byte]): ProtobufResult[WakuPeerRecord] =
-  var pb: WakuPeerRecordPB
+  var record: WakuPeerRecord
   try:
-    pb = Protobuf.decode(buffer, WakuPeerRecordPB)
+    record = Protobuf.decode(buffer, WakuPeerRecord)
   except SerializationError:
     return err(protobuf.ProtobufError(kind: ProtobufErrorKind.DecodeFailure))
 
-  if pb.addresses.len == 0:
+  if record.addresses.len == 0:
     return err(protobuf.ProtobufError(kind: ProtobufErrorKind.DecodeFailure))
 
-  ok(
-    WakuPeerRecord(
-      peerId: pb.peerId, seqNo: pb.seqNo, addresses: pb.addresses, mixKey: pb.mixKey
-    )
-  )
+  ok(record)
 
 proc decode*(
     T: typedesc[WakuPeerRecord], buffer: seq[byte]
 ): ProtobufResult[WakuPeerRecord] =
   decodeWakuPeerRecord(buffer)
 
 proc encode*(record: WakuPeerRecord): seq[byte] =
-  Protobuf.encode(
-    WakuPeerRecordPB(
-      peerId: record.peerId,
-      seqNo: record.seqNo,
-      addresses: record.addresses,
-      mixKey: record.mixKey,
-    )
-  )
+  Protobuf.encode(record)
 
 proc checkWakuPeerRecord*(
     _: WakuPeerRecord, spr: seq[byte], peerId: PeerId