Apply PR feedback

This commit is contained in:
Alex Stokes
2019-08-26 10:03:12 -07:00
parent c1ffb03f77
commit fa0acd9fc5
4 changed files with 6 additions and 16 deletions

View File

@ -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)

View File

@ -1,4 +1,7 @@
class MsgioException(Exception):
from libp2p.exceptions import BaseLibp2pError
class MsgioException(BaseLibp2pError):
pass

View File

@ -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

View File

@ -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())