From 49a92e564167c0ffdcc86838c5e45cc985665d96 Mon Sep 17 00:00:00 2001 From: Etan Kissling Date: Tue, 12 Mar 2024 18:29:01 +0100 Subject: [PATCH] avoid pointless exception raising in `dcutr/server` (#1063) --- libp2p/protocols/connectivity/dcutr/server.nim | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libp2p/protocols/connectivity/dcutr/server.nim b/libp2p/protocols/connectivity/dcutr/server.nim index e7140e1ee..5fc9cfbf7 100644 --- a/libp2p/protocols/connectivity/dcutr/server.nim +++ b/libp2p/protocols/connectivity/dcutr/server.nim @@ -19,7 +19,6 @@ import ../../protocol, ../../../switch, ../../../utils/future -export DcutrError export chronicles type Dcutr* = ref object of LPProtocol @@ -65,14 +64,14 @@ proc new*(T: typedesc[Dcutr], switch: Switch, connectTimeout = 15.seconds, maxDi except CancelledError as err: raise err except AllFuturesFailedError as err: - debug "Dcutr receiver could not connect to the remote peer, all connect attempts failed", peerDialableAddrs, msg = err.msg - raise newException(DcutrError, "Dcutr receiver could not connect to the remote peer, all connect attempts failed", err) + debug "Dcutr receiver could not connect to the remote peer, " & + "all connect attempts failed", peerDialableAddrs, msg = err.msg except AsyncTimeoutError as err: - debug "Dcutr receiver could not connect to the remote peer, all connect attempts timed out", peerDialableAddrs, msg = err.msg - raise newException(DcutrError, "Dcutr receiver could not connect to the remote peer, all connect attempts timed out", err) + debug "Dcutr receiver could not connect to the remote peer, " & + "all connect attempts timed out", peerDialableAddrs, msg = err.msg except CatchableError as err: - warn "Unexpected error when Dcutr receiver tried to connect to the remote peer", msg = err.msg - raise newException(DcutrError, "Unexpected error when Dcutr receiver tried to connect to the remote peer", err) + warn "Unexpected error when Dcutr receiver tried to connect " & + "to the remote peer", msg = err.msg let self = T() self.handler = handleStream