varun-r-mallya/py-libp2p
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/py-libp2p.git synced 2026-02-11 23:51:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

enforced f-strings everywhere, %s on logging

Browse Source 
extended _multiaddr_from_socket to support UDP and IPv6 automatically
changed TCPListener to use _ip4_or_6_from_multiaddr to get host, and not ip4 only

enforced `from error` everywhere with raises
added call braces to exceptions
This commit is contained in:
Jonathan de Jong
2019-12-19 17:31:18 +01:00
parent 6cf1b98a88
commit b1248ff315
16 changed files with 136 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libp2p/network/swarm.py
View File

@ -87,8 +87,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}")
except PeerStoreError as e:
raise SwarmException(f"No known addresses to peer {peer_id}") from e
if not addrs:
raise SwarmException(f"No known addresses to peer {peer_id}")
@ -101,7 +101,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)
@ -111,20 +111,20 @@ class Swarm(INetwork):
try:
secured_conn = await self.upgrader.upgrade_security(raw_conn, peer_id, True)
except SecurityUpgradeFailure as error:
error_msg = "fail to upgrade security for peer %s"
logger.debug(error_msg, peer_id)
logger.debug("failed to upgrade security for peer %s", peer_id)
await raw_conn.close()
raise SwarmException(error_msg % peer_id) from error # wip
raise SwarmException(
f"failed to upgrade security for peer {peer_id}"
) from error
logger.debug("upgraded security for peer %s", peer_id)
try:
muxed_conn = await self.upgrader.upgrade_connection(secured_conn, peer_id)
except MuxerUpgradeFailure as error:
error_msg = "fail to upgrade mux for peer %s"
logger.debug(error_msg, peer_id)
logger.debug("failed to upgrade mux for peer %s", peer_id)
await secured_conn.close()
raise SwarmException(error_msg % peer_id) from error # wip
raise SwarmException(f"failed to upgrade mux for peer {peer_id}") from error
logger.debug("upgraded mux for peer %s", peer_id)
@ -187,10 +187,11 @@ class Swarm(INetwork):
raw_conn, ID(b""), False
)
except SecurityUpgradeFailure as error:
error_msg = "fail to upgrade security for peer at %s"
logger.debug(error_msg, peer_addr)
logger.debug("failed to upgrade security for peer at %s", peer_addr)
await raw_conn.close()
raise SwarmException(error_msg % peer_addr) from error # wip
raise SwarmException(
f"failed to upgrade security for peer at {peer_addr}"
) from error
peer_id = secured_conn.get_remote_peer()
logger.debug("upgraded security for peer at %s", peer_addr)
@ -201,10 +202,11 @@ class Swarm(INetwork):
secured_conn, peer_id
)
except MuxerUpgradeFailure as error:
error_msg = "fail to upgrade mux for peer %s"
logger.debug(error_msg, peer_id)
logger.debug("fail to upgrade mux for peer %s", peer_id)
await secured_conn.close()
raise SwarmException(error_msg % peer_id) from error # wip
raise SwarmException(
f"fail to upgrade mux for peer {peer_id}"
) from error
logger.debug("upgraded mux for peer %s", peer_id)
await self.add_conn(muxed_conn)
@ -223,7 +225,7 @@ class Swarm(INetwork):
return True
except IOError:
# Failed. Continue looping.
logger.debug("fail to listen on: " + str(maddr))
logger.debug("fail to listen on: %s", maddr)
# No maddr succeeded
return False