Replace getCurrentException and getCurrentExceptionMsg

eth/net/nat.nim

@@ -71,8 +71,8 @@ proc getExternalIP*(natStrategy: NatStrategy, quiet = false): Option[IpAddress]
             externalIP = parseIpAddress(ires.value)
             strategy = NatUpnp
             return some(externalIP)
-          except:
+          except ValueError as e:
-            error "parseIpAddress() exception", err = getCurrentExceptionMsg()
+            error "parseIpAddress() exception", err = e.msg
             return
 
   if natStrategy == NatAny or natStrategy == NatPmp:
@@ -89,8 +89,8 @@ proc getExternalIP*(natStrategy: NatStrategy, quiet = false): Option[IpAddress]
           externalIP = parseIpAddress($(nires.value))
           strategy = NatPmp
           return some(externalIP)
-        except:
+        except ValueError as e:
-          error "parseIpAddress() exception", err = getCurrentExceptionMsg()
+          error "parseIpAddress() exception", err = e.msg
           return
 
 proc doPortMapping(tcpPort, udpPort: Port, description: string): Option[(Port, Port)] {.gcsafe.} =

eth/p2p/blockchain_sync.nim

@@ -198,10 +198,8 @@ proc obtainBlocksFromPeer(syncCtx: SyncContext, peer: Peer) {.async.} =
       syncCtx.endBlockNumber = bestBlockNumber
   except TransportError:
     debug "Transport got closed during obtainBlocksFromPeer"
-  except CatchableError:
+  except CatchableError as e:
-    debug "Exception in getBestBlockNumber()",
+    debug "Exception in getBestBlockNumber()", exc = e.name, err = e.msg
-      exc = getCurrentException().name,
-      err = getCurrentExceptionMsg()
     # no need to exit here, because the context might still have blocks to fetch
     # from this peer
 
@@ -252,13 +250,11 @@ proc obtainBlocksFromPeer(syncCtx: SyncContext, peer: Peer) {.async.} =
           warn "Bodies len != headers.len", bodies = bodies.len, headers = workItem.headers.len
     except TransportError:
       debug "Transport got closed during obtainBlocksFromPeer"
-    except CatchableError:
+    except CatchableError as e:
       # the success case sets `dataReceived`, so we can just fall back to the
       # failure path below. If we signal time-outs with exceptions such
       # failures will be easier to handle.
-      debug "Exception in obtainBlocksFromPeer()",
+      debug "Exception in obtainBlocksFromPeer()", exc = e.name, err = e.msg
-            exc = getCurrentException().name,
-            err = getCurrentExceptionMsg()
 
     var giveUpOnPeer = false
 
@@ -365,10 +361,8 @@ proc onPeerConnected(ctx: SyncContext, peer: Peer) =
           error "startSyncWithPeer failed", msg = f.readError.msg, peer
   except TransportError:
     debug "Transport got closed during startSyncWithPeer"
-  except CatchableError:
+  except CatchableError as e:
-    debug "Exception in startSyncWithPeer()",
+    debug "Exception in startSyncWithPeer()", exc = e.name, err = e.msg
-      exc = getCurrentException().name,
-      err = getCurrentExceptionMsg()
 
 
 proc onPeerDisconnected(ctx: SyncContext, p: Peer) =

eth/p2p/discovery.nim

@@ -263,10 +263,12 @@ proc processClient(transp: DatagramTransport,
     var buf = transp.getMessage()
     let a = Address(ip: raddr.address, udpPort: raddr.port, tcpPort: raddr.port)
     proto.receive(a, buf)
-  except RlpError, DiscProtocolError:
+  except RlpError as e:
-    debug "Receive failed", err = getCurrentExceptionMsg()
+    debug "Receive failed", exc = e.name, err = e.msg
-  except:
+  except DiscProtocolError as e:
-    debug "Receive failed", err = getCurrentExceptionMsg()
+    debug "Receive failed", exc = e.name, err = e.msg
+  except Exception as e:
+    debug "Receive failed", exc = e.name, err = e.msg
     raise
 
 proc open*(d: DiscoveryProtocol) =

eth/p2p/p2p_backends_helpers.nim

@@ -66,15 +66,13 @@ proc requestResolver[MsgType](msg: pointer, future: FutureBase) {.gcsafe.} =
       # This can except when the future still completes with an error.
       # E.g. the `sendMsg` fails because of an already closed transport or a
       # broken pipe
-      except TransportOsError:
+      except TransportOsError as e:
         # E.g. broken pipe
-        trace "TransportOsError during request", err = getCurrentExceptionMsg()
+        trace "TransportOsError during request", err = e.msg
       except TransportError:
         trace "Transport got closed during request"
-      except:
+      except Exception as e:
-        debug "Exception in requestResolver()",
+        debug "Exception in requestResolver()", exc = e.name, err = e.msg
-          exc = getCurrentException().name,
-          err = getCurrentExceptionMsg()
         raise
 
 proc linkSendFailureToReqFuture[S, R](sendFut: Future[S], resFut: Future[R]) =

eth/p2p/peer_pool.nim

@@ -173,8 +173,7 @@ proc run(p: PeerPool) {.async.} =
       # Most unexpected errors should be transient, so we log and restart from
       # scratch.
       error "Unexpected PeerPool error, restarting",
-            err = getCurrentExceptionMsg(),
+        err = e.msg, stackTrace = e.getStackTrace()
-            stackTrace = e.getStackTrace()
       dropConnections = true
 
     if dropConnections:

eth/p2p/rlpx.nim

@@ -443,11 +443,11 @@ proc checkedRlpRead(peer: Peer, r: var Rlp, MsgType: type): auto {.inline.} =
   else:
     try:
       return r.read(MsgType)
-    except:
+    except Exception as e:
       debug "Failed rlp.read",
             peer = peer,
             dataType = MsgType.name,
-            exception = getCurrentExceptionMsg()
+            exception = e.msg
             # rlpData = r.inspect
 
       raise
@@ -533,10 +533,9 @@ proc dispatchMessages*(peer: Peer) {.async.} =
         msg = peer.getMsgName(msgId)
       await peer.disconnect(BreachOfProtocol, true)
       return
-    except CatchableError:
+    except CatchableError as e:
       warn "Error while handling RLPx message", peer,
-        msg = peer.getMsgName(msgId),
+        msg = peer.getMsgName(msgId), err = e.msg
-        err = getCurrentExceptionMsg()
 
     # TODO: Hmm, this can be safely moved into the message handler thunk.
     # The documentation will need to be updated, explaning the fact that
@@ -546,12 +545,12 @@ proc dispatchMessages*(peer: Peer) {.async.} =
       let msgInfo = peer.dispatcher.messages[msgId]
       try:
         (msgInfo.nextMsgResolver)(msgData, peer.awaitedMessages[msgId])
-      except:
+      except CatchableError as e:
         # TODO: Handling errors here must be investigated more carefully.
         # They also are supposed to be handled at the call-site where
         # `nextMsg` is used.
         debug "nextMsg resolver failed, ending dispatchMessages loop", peer,
-               err = getCurrentExceptionMsg()
+               err = e.msg
         await peer.disconnect(BreachOfProtocol, true)
         return
       peer.awaitedMessages[msgId] = nil
@@ -1044,12 +1043,11 @@ proc rlpxConnect*(node: EthereumNode, remote: Node): Future[Peer] {.async.} =
     # Some peers report capabilities with names longer than 3 chars. We ignore
     # those for now. Maybe we should allow this though.
     debug "Rlp error in rlpxConnect"
-  except TransportOsError:
+  except TransportOsError as e:
-    trace "TransportOsError", err = getCurrentExceptionMsg()
+    trace "TransportOsError", err = e.msg
-  except CatchableError:
+  except CatchableError as e:
-    error "Unexpected exception in rlpxConnect", remote,
+    error "Unexpected exception in rlpxConnect", remote, exc = e.name,
-          exc = getCurrentException().name,
+      err = e.msg
-          err = getCurrentExceptionMsg()
 
   if not ok:
     if not isNil(result.transport):
@@ -1152,12 +1150,10 @@ proc rlpxAccept*(node: EthereumNode,
     # Some peers report capabilities with names longer than 3 chars. We ignore
     # those for now. Maybe we should allow this though.
     debug "Rlp error in rlpxAccept"
-  except TransportOsError:
+  except TransportOsError as e:
-    trace "TransportOsError", err = getCurrentExceptionMsg()
+    trace "TransportOsError", err = e.msg
-  except CatchableError:
+  except CatchableError as e:
-    error "Unexpected exception in rlpxAccept",
+    error "Unexpected exception in rlpxAccept", exc = e.name, err = e.msg
-          exc = getCurrentException().name,
-          err = getCurrentExceptionMsg()
 
   if not ok:
     if not isNil(result.transport):

eth/p2p/rlpx_protocols/les/flow_control.nim

@@ -118,9 +118,8 @@ proc loadMessageStats*(network: LesNetwork,
 
       return true
 
-    except RlpError:
+    except RlpError as e:
-      error "Error while loading LES message stats",
+      error "Error while loading LES message stats", err = e.msg
-            err = getCurrentExceptionMsg()
 
   newSeq(network.messageStats, les.messages[^1].id + 1)
   return false

tests/fuzzing/discovery/fuzz.nim

@@ -30,5 +30,5 @@ test:
     targetNode.receive(address, msg)
   # These errors are also catched in `processClient` in discovery.nim
   # TODO: move them a layer down in discovery so we can do a cleaner test there?
-  except RlpError, DiscProtocolError:
+  except RlpError, DiscProtocolError as e:
-    debug "Receive failed", err = getCurrentExceptionMsg()
+    debug "Receive failed", err = e.msg

tests/fuzzing/fuzztest.nim

@@ -7,7 +7,8 @@ template fuzz(body) =
     try:
       body
     except Exception as e:
-      error "Fuzzer input created exception", exception=e.name, trace=e.repr, msg=e.msg
+      error "Fuzzer input created exception", exception=e.name, trace=e.repr,
+        msg=e.msg
       discard kill(getpid(), SIGSEGV)
   else:
     body

tests/fuzzing/readme.md

@@ -32,8 +32,8 @@ test:
   try:
     var rlp = rlpFromBytes(@payload.toRange)
     discard rlp.inspect()
-  except RlpError:
+  except RlpError as e:
-    debug "Inspect failed", err = getCurrentExceptionMsg()
+    debug "Inspect failed", err = e.msg
 ```
 
 ## Supported Fuzzers

tests/fuzzing/rlp/rlp_inspect.nim

@@ -4,5 +4,5 @@ test:
   try:
     var rlp = rlpFromBytes(@payload.toRange)
     discard rlp.inspect()
-  except RlpError:
+  except RlpError as e:
-    debug "Inspect failed", err = getCurrentExceptionMsg()
+    debug "Inspect failed", err = e.msg