From ab7653526f7399607ff4f5558675821c2651ae1a Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Fri, 2 Aug 2019 16:02:07 -0700 Subject: [PATCH] Code cleanup / formatting --- libp2p/peer/id.py | 1 - libp2p/security/security_multistream.py | 17 ----------------- libp2p/transport/upgrader.py | 2 -- 3 files changed, 20 deletions(-) diff --git a/libp2p/peer/id.py b/libp2p/peer/id.py index bfb78d0e..26029b62 100644 --- a/libp2p/peer/id.py +++ b/libp2p/peer/id.py @@ -15,7 +15,6 @@ def _serialize_public_key(key: PublicKey) -> bytes: class ID: - _bytes: bytes _xor_id: int = None _b58_str: str = None diff --git a/libp2p/security/security_multistream.py b/libp2p/security/security_multistream.py index 5a4cca6a..9f25fab4 100644 --- a/libp2p/security/security_multistream.py +++ b/libp2p/security/security_multistream.py @@ -24,20 +24,13 @@ class SecurityMultistream(ABC): multiselect_client: MultiselectClient def __init__(self) -> None: - # Map protocol to secure transport self.transports = {} - - # Create multiselect self.multiselect = Multiselect() - - # Create multiselect client self.multiselect_client = MultiselectClient() def add_transport(self, protocol: TProtocol, transport: ISecureTransport) -> None: - # Associate protocol with transport self.transports[protocol] = transport - # Add protocol and handler to multiselect # Note: None is added as the handler for the given protocol since # we only care about selecting the protocol, not any handler function self.multiselect.add_handler(protocol, None) @@ -48,13 +41,8 @@ class SecurityMultistream(ABC): for an inbound connection (i.e. we are not the initiator) :return: secure connection object (that implements secure_conn_interface) """ - - # Select a secure transport transport = await self.select_transport(conn, False) - - # Create secured connection secure_conn = await transport.secure_inbound(conn) - return secure_conn async def secure_outbound(self, conn: IRawConnection, peer_id: ID) -> ISecureConn: @@ -63,13 +51,8 @@ class SecurityMultistream(ABC): for an inbound connection (i.e. we are the initiator) :return: secure connection object (that implements secure_conn_interface) """ - - # Select a secure transport transport = await self.select_transport(conn, True) - - # Create secured connection secure_conn = await transport.secure_outbound(conn, peer_id) - return secure_conn async def select_transport( diff --git a/libp2p/transport/upgrader.py b/libp2p/transport/upgrader.py index 28d4a51b..2aac45ef 100644 --- a/libp2p/transport/upgrader.py +++ b/libp2p/transport/upgrader.py @@ -54,7 +54,5 @@ class TransportUpgrader: """ Upgrade raw connection to muxed connection """ - - # For PoC, no security, default to mplex # TODO do exchange to determine multiplexer return Mplex(conn, generic_protocol_handler, peer_id)