From fa0acd9fc56af2122740f7b8e72bdb27779455e1 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Mon, 26 Aug 2019 10:03:12 -0700 Subject: [PATCH] Apply PR feedback --- libp2p/crypto/keys.py | 9 --------- libp2p/io/exceptions.py | 5 ++++- libp2p/security/secio/transport.py | 4 ++-- tests/security/test_secio.py | 4 ---- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/libp2p/crypto/keys.py b/libp2p/crypto/keys.py index 0cbdfd0e..5bcc5a37 100644 --- a/libp2p/crypto/keys.py +++ b/libp2p/crypto/keys.py @@ -99,15 +99,6 @@ class PrivateKey(Key): """ return self._serialize_to_protobuf().SerializeToString() - def _protobuf_from_serialization(self, data: bytes) -> protobuf.PrivateKey: - """ - Return the protobuf representation of this ``Key``. - """ - key_type = self.get_type().value - data = self.to_bytes() - protobuf_key = protobuf.PrivateKey(key_type=key_type, data=data) - return protobuf_key - @classmethod def deserialize_from_protobuf(cls, protobuf_data: bytes) -> protobuf.PrivateKey: return protobuf.PrivateKey.FromString(protobuf_data) diff --git a/libp2p/io/exceptions.py b/libp2p/io/exceptions.py index 4d06ece4..6e1376fa 100644 --- a/libp2p/io/exceptions.py +++ b/libp2p/io/exceptions.py @@ -1,4 +1,7 @@ -class MsgioException(Exception): +from libp2p.exceptions import BaseLibp2pError + + +class MsgioException(BaseLibp2pError): pass diff --git a/libp2p/security/secio/transport.py b/libp2p/security/secio/transport.py index 7bea92d8..4c3dbc08 100644 --- a/libp2p/security/secio/transport.py +++ b/libp2p/security/secio/transport.py @@ -350,14 +350,14 @@ async def create_secure_session( local_peer, local_private_key, remote_peer, conn, local_nonce ) except SecioException as e: - conn.close() + await conn.close() raise e session = _mk_session_from(local_private_key, session_parameters, conn) received_nonce = await _finish_handshake(session, remote_nonce) if received_nonce != local_nonce: - conn.close() + await conn.close() raise HandshakeFailed() return session diff --git a/tests/security/test_secio.py b/tests/security/test_secio.py index f9fdad72..673cbc58 100644 --- a/tests/security/test_secio.py +++ b/tests/security/test_secio.py @@ -99,7 +99,3 @@ async def test_create_secure_session(): remote_pipe_task.cancel() await local_pipe_task await remote_pipe_task - - -if __name__ == "__main__": - asyncio.run(test_create_secure_session())