StarMirror/py-libp2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Apply PR review feedback

Browse Source 
> add `if not addr` clause back
> use f-strings for exceptions instead of %s
This commit is contained in:
Jonathan de Jong 2019-12-18 18:47:03 +01:00
parent 4e4d91b2e2
commit 81fe4049cf
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libp2p/network/swarm.py
View File

@ -91,6 +91,9 @@ class Swarm(INetwork):
except PeerStoreError as error:
raise SwarmException(f"No known addresses to peer {peer_id}") from error
if not addrs:
raise SwarmException(f"No known addresses to peer {peer_id}")
exceptions: List[SwarmException] = []
# Try all known addresses
@ -107,19 +110,10 @@ class Swarm(INetwork):
)
# Tried all addresses, raising exception.
if len(exceptions) > 0:
raise SwarmException(
"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, no addresses established a successful connection "
"(tried %d addresses)",
peer_id,
len(addrs),
)
raise SwarmException(
f"unable to connect to {peer_id}, no addresses established a successful connection "
"(with exceptions)",
) from MultiError(exceptions)
async def dial_addr(self, addr: Multiaddr, peer_id: ID) -> INetConn:
"""
@ -138,7 +132,7 @@ class Swarm(INetwork):
except OpenConnectionError as error:
logger.debug("fail to dial peer %s over base transport", peer_id)
raise SwarmException(
"fail to open connection to peer %s", peer_id
f"fail to open connection to peer {peer_id}"
) from error
logger.debug("dialed peer %s over base transport", peer_id)