diff --git a/libp2p/crypto/ecc.py b/libp2p/crypto/ecc.py index 0559bf46..a9afe385 100644 --- a/libp2p/crypto/ecc.py +++ b/libp2p/crypto/ecc.py @@ -32,7 +32,7 @@ class ECCPublicKey(PublicKey): return KeyType.ECC_P256 def verify(self, data: bytes, signature: bytes) -> bool: - raise NotImplementedError + raise NotImplementedError() class ECCPrivateKey(PrivateKey): @@ -53,7 +53,7 @@ class ECCPrivateKey(PrivateKey): return KeyType.ECC_P256 def sign(self, data: bytes) -> bytes: - raise NotImplementedError + raise NotImplementedError() def get_public_key(self) -> PublicKey: public_key_impl = keys.get_public_key(self.impl, self.curve) diff --git a/libp2p/crypto/serialization.py b/libp2p/crypto/serialization.py index d453bfe1..fe4ffeb1 100644 --- a/libp2p/crypto/serialization.py +++ b/libp2p/crypto/serialization.py @@ -20,8 +20,10 @@ def deserialize_public_key(data: bytes) -> PublicKey: f = PublicKey.deserialize_from_protobuf(data) try: deserializer = key_type_to_public_key_deserializer[f.key_type] - except KeyError: - raise MissingDeserializerError({"key_type": f.key_type, "key": "public_key"}) + except KeyError as e: + raise MissingDeserializerError( + {"key_type": f.key_type, "key": "public_key"} + ) from e return deserializer(f.data) @@ -29,6 +31,8 @@ def deserialize_private_key(data: bytes) -> PrivateKey: f = PrivateKey.deserialize_from_protobuf(data) try: deserializer = key_type_to_private_key_deserializer[f.key_type] - except KeyError: - raise MissingDeserializerError({"key_type": f.key_type, "key": "private_key"}) + except KeyError as e: + raise MissingDeserializerError( + {"key_type": f.key_type, "key": "private_key"} + ) from e return deserializer(f.data) diff --git a/libp2p/host/basic_host.py b/libp2p/host/basic_host.py index 6386fb83..cc5ff8c6 100644 --- a/libp2p/host/basic_host.py +++ b/libp2p/host/basic_host.py @@ -95,7 +95,7 @@ class BasicHost(IHost): :return: all the multiaddr addresses this host is listening to """ # TODO: We don't need "/p2p/{peer_id}" postfix actually. - p2p_part = multiaddr.Multiaddr("/p2p/{}".format(self.get_id().pretty())) + p2p_part = multiaddr.Multiaddr(f"/p2p/{self.get_id()!s}") addrs: List[multiaddr.Multiaddr] = [] for transport in self._network.listeners.values(): @@ -147,7 +147,7 @@ class BasicHost(IHost): except MultiselectClientError as error: logger.debug("fail to open a stream to peer %s, error=%s", peer_id, error) await net_stream.reset() - raise StreamFailure("failt to open a stream to peer %s", peer_id) from error + raise StreamFailure(f"failed to open a stream to peer {peer_id}") from error net_stream.set_protocol(selected_protocol) return net_stream diff --git a/libp2p/network/stream/net_stream.py b/libp2p/network/stream/net_stream.py index b2bac06a..72d5c6a7 100644 --- a/libp2p/network/stream/net_stream.py +++ b/libp2p/network/stream/net_stream.py @@ -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.""" diff --git a/libp2p/network/swarm.py b/libp2p/network/swarm.py index 57ce1358..2c870dd0 100644 --- a/libp2p/network/swarm.py +++ b/libp2p/network/swarm.py @@ -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 diff --git a/libp2p/peer/id.py b/libp2p/peer/id.py index 9870011b..0a55739c 100644 --- a/libp2p/peer/id.py +++ b/libp2p/peer/id.py @@ -56,7 +56,7 @@ class ID: return self._b58_str def __repr__(self) -> str: - return f"" + return f"" __str__ = pretty = to_string = to_base58 diff --git a/libp2p/peer/peerstore.py b/libp2p/peer/peerstore.py index f9a9fbdb..0314308d 100644 --- a/libp2p/peer/peerstore.py +++ b/libp2p/peer/peerstore.py @@ -71,7 +71,7 @@ class PeerStore(IPeerStore): try: val = self.peer_data_map[peer_id].get_metadata(key) except PeerDataError as error: - raise PeerStoreError(error) + raise PeerStoreError() from error return val raise PeerStoreError("peer ID not found") @@ -153,8 +153,8 @@ class PeerStore(IPeerStore): peer_data = self.peer_data_map[peer_id] try: pubkey = peer_data.get_pubkey() - except PeerDataError: - raise PeerStoreError("peer pubkey not found") + except PeerDataError as e: + raise PeerStoreError("peer pubkey not found") from e return pubkey raise PeerStoreError("peer ID not found") @@ -179,8 +179,8 @@ class PeerStore(IPeerStore): peer_data = self.peer_data_map[peer_id] try: privkey = peer_data.get_privkey() - except PeerDataError: - raise PeerStoreError("peer privkey not found") + except PeerDataError as e: + raise PeerStoreError("peer privkey not found") from e return privkey raise PeerStoreError("peer ID not found") diff --git a/libp2p/protocol_muxer/multiselect.py b/libp2p/protocol_muxer/multiselect.py index 2ea1e748..c3cced3a 100644 --- a/libp2p/protocol_muxer/multiselect.py +++ b/libp2p/protocol_muxer/multiselect.py @@ -49,7 +49,7 @@ class Multiselect(IMultiselectMuxer): try: command = await communicator.read() except MultiselectCommunicatorError as error: - raise MultiselectError(error) + raise MultiselectError() from error if command == "ls": # TODO: handle ls command @@ -60,13 +60,13 @@ class Multiselect(IMultiselectMuxer): try: await communicator.write(protocol) except MultiselectCommunicatorError as error: - raise MultiselectError(error) + raise MultiselectError() from error return protocol, self.handlers[protocol] try: await communicator.write(PROTOCOL_NOT_FOUND_MSG) except MultiselectCommunicatorError as error: - raise MultiselectError(error) + raise MultiselectError() from error async def handshake(self, communicator: IMultiselectCommunicator) -> None: """ @@ -78,12 +78,12 @@ class Multiselect(IMultiselectMuxer): try: await communicator.write(MULTISELECT_PROTOCOL_ID) except MultiselectCommunicatorError as error: - raise MultiselectError(error) + raise MultiselectError() from error try: handshake_contents = await communicator.read() except MultiselectCommunicatorError as error: - raise MultiselectError(error) + raise MultiselectError() from error if not is_valid_handshake(handshake_contents): raise MultiselectError( diff --git a/libp2p/protocol_muxer/multiselect_client.py b/libp2p/protocol_muxer/multiselect_client.py index 89fc9754..50c4fefb 100644 --- a/libp2p/protocol_muxer/multiselect_client.py +++ b/libp2p/protocol_muxer/multiselect_client.py @@ -25,12 +25,12 @@ class MultiselectClient(IMultiselectClient): try: await communicator.write(MULTISELECT_PROTOCOL_ID) except MultiselectCommunicatorError as error: - raise MultiselectClientError(error) + raise MultiselectClientError() from error try: handshake_contents = await communicator.read() except MultiselectCommunicatorError as error: - raise MultiselectClientError(str(error)) + raise MultiselectClientError() from error if not is_valid_handshake(handshake_contents): raise MultiselectClientError("multiselect protocol ID mismatch") @@ -73,18 +73,18 @@ class MultiselectClient(IMultiselectClient): try: await communicator.write(protocol) except MultiselectCommunicatorError as error: - raise MultiselectClientError(error) + raise MultiselectClientError() from error try: response = await communicator.read() except MultiselectCommunicatorError as error: - raise MultiselectClientError(str(error)) + raise MultiselectClientError() from error if response == protocol: return protocol if response == PROTOCOL_NOT_FOUND_MSG: raise MultiselectClientError("protocol not supported") - raise MultiselectClientError("unrecognized response: " + response) + raise MultiselectClientError(f"unrecognized response: {response}") def is_valid_handshake(handshake_contents: str) -> bool: diff --git a/libp2p/pubsub/pubsub.py b/libp2p/pubsub/pubsub.py index ecfa544d..2045d487 100644 --- a/libp2p/pubsub/pubsub.py +++ b/libp2p/pubsub/pubsub.py @@ -567,10 +567,12 @@ class Pubsub(Service, IPubsub): await self.validate_msg(msg_forwarder, msg) except ValidationError: logger.debug( - "Topic validation failed: sender %s sent data %s under topic IDs: %s", - f"{base58.b58encode(msg.from_id).decode()}:{msg.seqno.hex()}", + "Topic validation failed: sender %s sent data %s under topic IDs: %s %s:%s", + msg_forwarder, msg.data.hex(), msg.topicIDs, + base58.b58encode(msg.from_id).decode(), + msg.seqno.hex(), ) return diff --git a/libp2p/security/insecure/transport.py b/libp2p/security/insecure/transport.py index abce868c..103a580f 100644 --- a/libp2p/security/insecure/transport.py +++ b/libp2p/security/insecure/transport.py @@ -52,13 +52,13 @@ class InsecureSession(BaseSession): encoded_msg_bytes = encode_fixedint_prefixed(msg_bytes) try: await self.write(encoded_msg_bytes) - except RawConnError: - raise HandshakeFailure("connection closed") + except RawConnError as e: + raise HandshakeFailure("connection closed") from e try: remote_msg_bytes = await read_fixedint_prefixed(self.conn) - except RawConnError: - raise HandshakeFailure("connection closed") + except RawConnError as e: + raise HandshakeFailure("connection closed") from e remote_msg = plaintext_pb2.Exchange() remote_msg.ParseFromString(remote_msg_bytes) received_peer_id = ID(remote_msg.id) @@ -77,12 +77,12 @@ class InsecureSession(BaseSession): received_pubkey = deserialize_public_key( remote_msg.pubkey.SerializeToString() ) - except ValueError: + except ValueError as e: raise HandshakeFailure( f"unknown `key_type` of remote_msg.pubkey={remote_msg.pubkey}" - ) + ) from e except MissingDeserializerError as error: - raise HandshakeFailure(error) + raise HandshakeFailure() from error peer_id_from_received_pubkey = ID.from_pubkey(received_pubkey) if peer_id_from_received_pubkey != received_peer_id: raise HandshakeFailure( diff --git a/libp2p/security/secio/transport.py b/libp2p/security/secio/transport.py index 23359215..9e98873b 100644 --- a/libp2p/security/secio/transport.py +++ b/libp2p/security/secio/transport.py @@ -131,8 +131,8 @@ class SecureSession(BaseSession): msg = await self.conn.read_msg() try: decrypted_msg = self.remote_encrypter.decrypt_if_valid(msg) - except InvalidMACException: - raise DecryptionFailedException + except InvalidMACException as e: + raise DecryptionFailedException() from e return decrypted_msg async def write(self, data: bytes) -> int: @@ -175,7 +175,7 @@ class Proposal: try: public_key = deserialize_public_key(public_key_protobuf_bytes) except MissingDeserializerError as error: - raise SedesException(error) + raise SedesException() from error exchanges = protobuf.exchanges ciphers = protobuf.ciphers hashes = protobuf.hashes @@ -424,8 +424,8 @@ async def create_secure_session( await conn.close() raise e # `IOException` includes errors raised while read from/write to raw connection - except IOException: - raise SecioException("connection closed") + except IOException as e: + raise SecioException("connection closed") from e is_initiator = remote_peer is not None session = _mk_session_from( @@ -435,8 +435,8 @@ async def create_secure_session( try: received_nonce = await _finish_handshake(session, remote_nonce) # `IOException` includes errors raised while read from/write to raw connection - except IOException: - raise SecioException("connection closed") + except IOException as e: + raise SecioException("connection closed") from e if received_nonce != local_nonce: await conn.close() raise InconsistentNonce() diff --git a/libp2p/tools/interop/daemon.py b/libp2p/tools/interop/daemon.py index f6e363e0..3344255a 100644 --- a/libp2p/tools/interop/daemon.py +++ b/libp2p/tools/interop/daemon.py @@ -26,7 +26,7 @@ class P2PDProcess(BaseInteractiveProcess): is_pubsub_signing: bool = False, is_pubsub_signing_strict: bool = False, ) -> None: - args = [f"-listen={str(control_maddr)}"] + args = [f"-listen={control_maddr!s}"] # NOTE: To support `-insecure`, we need to hack `go-libp2p-daemon`. if not is_secure: args.append("-insecure=true") diff --git a/libp2p/tools/pubsub/dummy_account_node.py b/libp2p/tools/pubsub/dummy_account_node.py index f29a9fd5..32f78851 100644 --- a/libp2p/tools/pubsub/dummy_account_node.py +++ b/libp2p/tools/pubsub/dummy_account_node.py @@ -81,7 +81,7 @@ class DummyAccountNode(Service): :param dest_user: user to send crypto to :param amount: amount of crypto to send """ - msg_contents = "send," + source_user + "," + dest_user + "," + str(amount) + msg_contents = f"send,{source_user},{dest_user},{amount!s}" await self.pubsub.publish(CRYPTO_TOPIC, msg_contents.encode()) async def publish_set_crypto(self, user: str, amount: int) -> None: @@ -92,7 +92,7 @@ class DummyAccountNode(Service): :param user: user to set crypto for :param amount: amount of crypto """ - msg_contents = "set," + user + "," + str(amount) + msg_contents = f"set,{user},{amount!s}" await self.pubsub.publish(CRYPTO_TOPIC, msg_contents.encode()) def handle_send_crypto(self, source_user: str, dest_user: str, amount: int) -> None: diff --git a/tox.ini b/tox.ini index 9c703d8e..a03627ee 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ envlist = combine_as_imports=False force_sort_within_sections=True include_trailing_comma=True -known_third_party=anyio,factory,p2pclient,pytest +known_third_party=anyio,factory,lru,p2pclient,pytest known_first_party=libp2p line_length=88 multi_line_output=3