This commit is contained in:
Chih Cheng Liang
2019-08-08 14:22:06 +08:00
committed by Kevin Mai-Husan Chia
parent 5903012e0e
commit c536aa3e07
19 changed files with 58 additions and 62 deletions

View File

@ -1,5 +1,5 @@
from abc import ABC
from typing import Dict, NewType
from typing import Dict
from libp2p.network.connection.raw_connection_interface import IRawConnection
from libp2p.peer.id import ID
@ -20,9 +20,9 @@ Relevant go repo: https://github.com/libp2p/go-conn-security/blob/master/interfa
class SecurityMultistream(ABC):
transports: Dict[TProtocol, "ISecureTransport"]
multiselect: "Multiselect"
multiselect_client: "MultiselectClient"
transports: Dict[TProtocol, ISecureTransport]
multiselect: Multiselect
multiselect_client: MultiselectClient
def __init__(self) -> None:
# Map protocol to secure transport
@ -34,7 +34,7 @@ class SecurityMultistream(ABC):
# Create multiselect client
self.multiselect_client = MultiselectClient()
def add_transport(self, protocol: TProtocol, transport: "ISecureTransport") -> None:
def add_transport(self, protocol: TProtocol, transport: ISecureTransport) -> None:
# Associate protocol with transport
self.transports[protocol] = transport
@ -43,7 +43,7 @@ class SecurityMultistream(ABC):
# we only care about selecting the protocol, not any handler function
self.multiselect.add_handler(protocol, None)
async def secure_inbound(self, conn: "IRawConnection") -> "ISecureConn":
async def secure_inbound(self, conn: IRawConnection) -> ISecureConn:
"""
Secure the connection, either locally or by communicating with opposing node via conn,
for an inbound connection (i.e. we are not the initiator)
@ -58,7 +58,7 @@ class SecurityMultistream(ABC):
return secure_conn
async def secure_outbound(self, conn: "IRawConnection", peer_id: "ID") -> "ISecureConn":
async def secure_outbound(self, conn: IRawConnection, peer_id: ID) -> ISecureConn:
"""
Secure the connection, either locally or by communicating with opposing node via conn,
for an inbound connection (i.e. we are the initiator)
@ -73,7 +73,7 @@ class SecurityMultistream(ABC):
return secure_conn
async def select_transport(self, conn: "IRawConnection", initiator: bool) -> "ISecureTransport":
async def select_transport(self, conn: IRawConnection, initiator: bool) -> ISecureTransport:
"""
Select a transport that both us and the node on the
other end of conn support and agree on