update error handling

Author: gerceboss

execution_chain/networking/discoveryv5.nim

@@ -30,6 +30,8 @@ type
   DiscoveryV5* = protocol.Protocol
   NodeV5* = node.Node
   AddressV5* = node.Address
+  
+  DiscResult*[T] = Result[T, cstring]
 
 proc newDiscoveryV5*(
     privKey: PrivateKey,
@@ -55,10 +57,14 @@ proc newDiscoveryV5*(
     rng = rng
   )
 
-proc receiveV5*(d: Protocol, a: Address, packet: openArray[byte]): Result[void, cstring] =
+proc receiveV5*(d: Protocol, a: Address, packet: openArray[byte]): DiscResult[void] =
   discv5_network_bytes.inc(packet.len.int64, labelValues = [$Direction.In])
 
-  let packet = ?d.codec.decodePacket(a, packet)
+  let decoded = d.codec.decodePacket(a, packet)
+  if decoded.isErr():
+    return err("discv5: Failed to decode packet")
+
+  let packet = decoded[]
 
   case packet.flag
   of OrdinaryMessage:

execution_chain/networking/eth1_discovery.nim

@@ -84,8 +84,9 @@ proc processClient(
   if discv4.isErr:
     # unhandled buf will be handled by discv5
     let addrv5 = raddr.to(AddressV5)
-    proto.discv5.receiveV5(addrv5, buf).isOkOr:
-      debug "Discovery receive error", discv4=discv4.error, discv5=error
+    let discv5 = proto.discv5.receiveV5(addrv5, buf)
+    if discv5.isErr:
+      debug "Discovery receive error", discv4=discv4.error, discv5=discv5.error
 
 #------------------------------------------------------------------------------
 # Public functions