From 6b759012438773067e1642a4a7a7e158d54eeec5 Mon Sep 17 00:00:00 2001 From: Jonathan de Jong Date: Tue, 17 Dec 2019 20:20:09 +0100 Subject: [PATCH] apply PR feedback (remote len == 0 block, remove redundant fixme comment + docstring line) change wording of final SwarmException to include possible case of no addresses in returned address set add `from error` in except clause --- libp2p/network/swarm.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libp2p/network/swarm.py b/libp2p/network/swarm.py index 5099a5d..2e36ddd 100644 --- a/libp2p/network/swarm.py +++ b/libp2p/network/swarm.py @@ -88,11 +88,8 @@ class Swarm(INetwork): try: # Get peer info from peer store addrs = self.peerstore.addrs(peer_id) - except PeerStoreError: - raise SwarmException(f"No known addresses to peer {peer_id}") - - if len(addrs) == 0: - raise SwarmException(f"No known addresses to peer {peer_id}") + except PeerStoreError as error: + raise SwarmException(f"No known addresses to peer {peer_id}") from error exceptions: List[SwarmException] = [] @@ -112,12 +109,16 @@ class Swarm(INetwork): # Tried all addresses, raising exception. if len(exceptions) > 0: raise SwarmException( - "unable to connect to %s, all addresses failed to dial (with exceptions)", + "unable to connect to %s, no addresses established a successful connection " + "(with exceptions)", peer_id, ) from MultiError(exceptions) else: raise SwarmException( - "unable to connect to %s, all addresses failed to dial", peer_id + "unable to connect to %s, no addresses established a successful connection " + "(tried %d addresses)", + peer_id, + len(addrs), ) async def dial_addr(self, addr: Multiaddr, peer_id: ID) -> INetConn: @@ -173,7 +174,6 @@ class Swarm(INetwork): async def new_stream(self, peer_id: ID) -> INetStream: """ :param peer_id: peer_id of destination - :param protocol_id: protocol id fixme: protocol_id not in parameters :raises SwarmException: raised when an error occurs :return: net stream instance """