varun-r-mallya/py-libp2p
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/py-libp2p.git synced 2025-12-31 20:36:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/trio

Browse Source
This commit is contained in:
mhchia
2020-02-06 10:39:54 +08:00
parent 7c74e36d41 8e0972f256
commit f1dbd52d67
15 changed files with 69 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libp2p/network/stream/net_stream.py
View File

@ -47,9 +47,9 @@ class NetStream(INetStream):
try:
return await self.muxed_stream.read(n)
except MuxedStreamEOF as error:
raise StreamEOF from error
raise StreamEOF() from error
except MuxedStreamReset as error:
raise StreamReset from error
raise StreamReset() from error
async def write(self, data: bytes) -> int:
"""
@ -60,7 +60,7 @@ class NetStream(INetStream):
try:
return await self.muxed_stream.write(data)
except MuxedStreamClosed as error:
raise StreamClosed from error
raise StreamClosed() from error
async def close(self) -> None:
"""close stream."""

27
libp2p/network/swarm.py
View File

@ -171,20 +171,21 @@ class Swarm(Service, INetworkService):
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
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
raise SwarmException(f"failed to upgrade mux for peer {peer_id}") from error
logger.debug("upgraded mux for peer %s", peer_id)
swarm_conn = await self.add_conn(muxed_conn)
@ -241,8 +242,11 @@ class Swarm(Service, INetworkService):
raw_conn, ID(b""), False
)
except SecurityUpgradeFailure as error:
logger.debug("failed to upgrade security for peer at %s", maddr)
await raw_conn.close()
raise SwarmException() from error
raise SwarmException(
f"failed to upgrade security for peer at {maddr}"
) from error
peer_id = secured_conn.get_remote_peer()
try:
@ -250,10 +254,11 @@ class Swarm(Service, INetworkService):
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
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)
@ -279,7 +284,7 @@ class Swarm(Service, INetworkService):
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