StarMirror/py-libp2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some code cleanup

Browse Source
This commit is contained in:
Alex Stokes 2019-08-24 11:43:27 +02:00
parent 3f4589d497
commit 228032805a
No known key found for this signature in database
GPG Key ID: 51CE1721B245C086
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libp2p/__init__.py
View File

@ -100,7 +100,7 @@ def initialize_default_swarm(
muxer_transports_by_protocol = muxer_opt or {MPLEX_PROTOCOL_ID: Mplex} muxer_transports_by_protocol = muxer_opt or {MPLEX_PROTOCOL_ID: Mplex}
security_transports_by_protocol = sec_opt or { security_transports_by_protocol = sec_opt or {
TProtocol(PLAINTEXT_PROTOCOL_ID): InsecureTransport(key_pair), TProtocol(PLAINTEXT_PROTOCOL_ID): InsecureTransport(key_pair),
TProtocol(secio.ID): secio.SecIOTransport(key_pair), TProtocol(secio.ID): secio.Transport(key_pair),
} }
upgrader = TransportUpgrader( upgrader = TransportUpgrader(
security_transports_by_protocol, muxer_transports_by_protocol security_transports_by_protocol, muxer_transports_by_protocol

30
libp2p/security/secio/transport.py
View File

@ -344,17 +344,17 @@ async def _finish_handshake(session: ISecureConn, remote_nonce: bytes) -> bytes:
async def create_secure_session( async def create_secure_session(
transport: "SecIOTransport", conn: IRawConnection, remote_peer: PeerID = None local_nonce: bytes,
local_peer: PeerID,
local_private_key: PrivateKey,
conn: IRawConnection,
remote_peer: PeerID = None,
) -> ISecureConn: ) -> ISecureConn:
""" """
Attempt the initial `secio` handshake with the remote peer. Attempt the initial `secio` handshake with the remote peer.
If successful, return an object that provides secure communication to the If successful, return an object that provides secure communication to the
``remote_peer``. ``remote_peer``.
""" """
local_nonce = transport.get_nonce()
local_peer = transport.local_peer
local_private_key = transport.local_private_key
try: try:
session_parameters, remote_nonce = await _establish_session_parameters( session_parameters, remote_nonce = await _establish_session_parameters(
local_peer, local_private_key, remote_peer, conn, local_nonce local_peer, local_private_key, remote_peer, conn, local_nonce
@ -373,9 +373,9 @@ async def create_secure_session(
return session return session
class SecIOTransport(BaseSecureTransport): class Transport(BaseSecureTransport):
""" """
``SecIOTransport`` provides a security upgrader for a ``IRawConnection``, ``Transport`` provides a security upgrader for a ``IRawConnection``,
following the `secio` protocol defined in the libp2p specs. following the `secio` protocol defined in the libp2p specs.
""" """
@ -388,7 +388,13 @@ class SecIOTransport(BaseSecureTransport):
for an inbound connection (i.e. we are not the initiator) for an inbound connection (i.e. we are not the initiator)
:return: secure connection object (that implements secure_conn_interface) :return: secure connection object (that implements secure_conn_interface)
""" """
return await create_secure_session(self, conn) local_nonce = self.get_nonce()
local_peer = self.local_peer
local_private_key = self.local_private_key
return await create_secure_session(
local_nonce, local_peer, local_private_key, conn
)
async def secure_outbound( async def secure_outbound(
self, conn: IRawConnection, peer_id: PeerID self, conn: IRawConnection, peer_id: PeerID
@ -398,4 +404,10 @@ class SecIOTransport(BaseSecureTransport):
for an inbound connection (i.e. we are the initiator) for an inbound connection (i.e. we are the initiator)
:return: secure connection object (that implements secure_conn_interface) :return: secure connection object (that implements secure_conn_interface)
""" """
return await create_secure_session(self, conn, peer_id) local_nonce = self.get_nonce()
local_peer = self.local_peer
local_private_key = self.local_private_key
return await create_secure_session(
local_nonce, local_peer, local_private_key, conn, peer_id
)