From 5da102d1c9b456b6afa8fa8b7f0713c3c07dbe7b Mon Sep 17 00:00:00 2001 From: mhchia Date: Tue, 4 Feb 2020 15:09:42 +0800 Subject: [PATCH] Ping protocol: move `with` statement out of `try` --- libp2p/host/ping.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libp2p/host/ping.py b/libp2p/host/ping.py index 9e23f1cc..01102451 100644 --- a/libp2p/host/ping.py +++ b/libp2p/host/ping.py @@ -17,23 +17,23 @@ logger = logging.getLogger("libp2p.host.ping") async def _handle_ping(stream: INetStream, peer_id: PeerID) -> bool: """Return a boolean indicating if we expect more pings from the peer at ``peer_id``.""" - with trio.fail_after(RESP_TIMEOUT): - try: + try: + with trio.fail_after(RESP_TIMEOUT): payload = await stream.read(PING_LENGTH) - except trio.TooSlowError as error: - logger.debug("Timed out waiting for ping from %s: %s", peer_id, error) - raise - except StreamEOF: - logger.debug("Other side closed while waiting for ping from %s", peer_id) - return False - except StreamReset as error: - logger.debug( - "Other side reset while waiting for ping from %s: %s", peer_id, error - ) - raise - except Exception as error: - logger.debug("Error while waiting to read ping for %s: %s", peer_id, error) - raise + except trio.TooSlowError as error: + logger.debug("Timed out waiting for ping from %s: %s", peer_id, error) + raise + except StreamEOF: + logger.debug("Other side closed while waiting for ping from %s", peer_id) + return False + except StreamReset as error: + logger.debug( + "Other side reset while waiting for ping from %s: %s", peer_id, error + ) + raise + except Exception as error: + logger.debug("Error while waiting to read ping for %s: %s", peer_id, error) + raise logger.debug("Received ping from %s with data: 0x%s", peer_id, payload.hex())