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

Change SwarmConn.conn to muxed_conn

Browse Source
This commit is contained in:
mhchia 2019-09-23 15:46:50 +08:00
parent 8d2415a404
commit 92deae41dc
No known key found for this signature in database
GPG Key ID: 389EFBEA1362589A
7 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libp2p/network/connection/net_connection_interface.py
View File

@ -7,7 +7,7 @@ from libp2p.stream_muxer.abc import IMuxedConn
class INetConn(Closer): class INetConn(Closer):
conn: IMuxedConn muxed_conn: IMuxedConn
@abstractmethod @abstractmethod
async def new_stream(self) -> INetStream: async def new_stream(self) -> INetStream:

12
libp2p/network/connection/swarm_connection.py
View File

@ -16,15 +16,15 @@ Reference: https://github.com/libp2p/go-libp2p-swarm/blob/04c86bbdafd390651cb2ee
class SwarmConn(INetConn): class SwarmConn(INetConn):
conn: IMuxedConn muxed_conn: IMuxedConn
swarm: "Swarm" swarm: "Swarm"
streams: Set[NetStream] streams: Set[NetStream]
event_closed: asyncio.Event event_closed: asyncio.Event
_tasks: List["asyncio.Future[Any]"] _tasks: List["asyncio.Future[Any]"]
def __init__(self, conn: IMuxedConn, swarm: "Swarm") -> None: def __init__(self, muxed_conn: IMuxedConn, swarm: "Swarm") -> None:
self.conn = conn self.muxed_conn = muxed_conn
self.swarm = swarm self.swarm = swarm
self.streams = set() self.streams = set()
self.event_closed = asyncio.Event() self.event_closed = asyncio.Event()
@ -37,7 +37,7 @@ class SwarmConn(INetConn):
self.event_closed.set() self.event_closed.set()
self.swarm.remove_conn(self) self.swarm.remove_conn(self)
await self.conn.close() await self.muxed_conn.close()
# This is just for cleaning up state. The connection has already been closed. # This is just for cleaning up state. The connection has already been closed.
# We *could* optimize this but it really isn't worth it. # We *could* optimize this but it really isn't worth it.
@ -56,7 +56,7 @@ class SwarmConn(INetConn):
async def _handle_new_streams(self) -> None: async def _handle_new_streams(self) -> None:
while True: while True:
try: try:
stream = await self.conn.accept_stream() stream = await self.muxed_conn.accept_stream()
except MuxedConnUnavailable: except MuxedConnUnavailable:
# If there is anything wrong in the MuxedConn, # If there is anything wrong in the MuxedConn,
# we should break the loop and close the connection. # we should break the loop and close the connection.
@ -96,7 +96,7 @@ class SwarmConn(INetConn):
self._tasks.append(asyncio.ensure_future(coro)) self._tasks.append(asyncio.ensure_future(coro))
async def new_stream(self) -> NetStream: async def new_stream(self) -> NetStream:
muxed_stream = await self.conn.open_stream() muxed_stream = await self.muxed_conn.open_stream()
return self._add_stream(muxed_stream) return self._add_stream(muxed_stream)
async def get_streams(self) -> Tuple[NetStream, ...]: async def get_streams(self) -> Tuple[NetStream, ...]:

4
libp2p/network/stream/net_stream.py
View File

@ -1,3 +1,5 @@
from typing import Optional
from libp2p.stream_muxer.abc import IMuxedStream from libp2p.stream_muxer.abc import IMuxedStream
from libp2p.stream_muxer.exceptions import ( from libp2p.stream_muxer.exceptions import (
MuxedStreamClosed, MuxedStreamClosed,
@ -16,7 +18,7 @@ from .net_stream_interface import INetStream
class NetStream(INetStream): class NetStream(INetStream):
muxed_stream: IMuxedStream muxed_stream: IMuxedStream
protocol_id: TProtocol protocol_id: Optional[TProtocol]
def __init__(self, muxed_stream: IMuxedStream) -> None: def __init__(self, muxed_stream: IMuxedStream) -> None:
self.muxed_stream = muxed_stream self.muxed_stream = muxed_stream

2
libp2p/network/swarm.py
View File

@ -279,7 +279,7 @@ class Swarm(INetwork):
""" """
Simply remove the connection from Swarm's records, without closing the connection. Simply remove the connection from Swarm's records, without closing the connection.
""" """
peer_id = swarm_conn.conn.peer_id peer_id = swarm_conn.muxed_conn.peer_id
if peer_id not in self.connections: if peer_id not in self.connections:
return return
# TODO: Should be changed to remove the exact connection, # TODO: Should be changed to remove the exact connection,

2
libp2p/pubsub/pubsub_notifee.py
View File

@ -36,7 +36,7 @@ class PubsubNotifee(INotifee):
:param network: network the connection was opened on :param network: network the connection was opened on
:param conn: connection that was opened :param conn: connection that was opened
""" """
await self.initiator_peers_queue.put(conn.conn.peer_id) await self.initiator_peers_queue.put(conn.muxed_conn.peer_id)
async def disconnected(self, network: INetwork, conn: INetConn) -> None: async def disconnected(self, network: INetwork, conn: INetConn) -> None:
pass pass

2
tests/factories.py
View File

@ -155,7 +155,7 @@ async def mplex_conn_pair_factory(is_secure: bool) -> Tuple[Mplex, Swarm, Mplex,
conn_0, swarm_0, conn_1, swarm_1 = await swarm_conn_pair_factory( conn_0, swarm_0, conn_1, swarm_1 = await swarm_conn_pair_factory(
is_secure, muxer_opt=muxer_opt is_secure, muxer_opt=muxer_opt
) )
return conn_0.conn, swarm_0, conn_1.conn, swarm_1 return conn_0.muxed_conn, swarm_0, conn_1.muxed_conn, swarm_1
async def mplex_stream_pair_factory( async def mplex_stream_pair_factory(

4
tests/security/test_security_multistream.py
View File

@ -53,8 +53,8 @@ async def perform_simple_test(
node2_conn = node2.get_network().connections[peer_id_for_node(node1)] node2_conn = node2.get_network().connections[peer_id_for_node(node1)]
# Perform assertion # Perform assertion
assertion_func(node1_conn.conn.secured_conn) assertion_func(node1_conn.muxed_conn.secured_conn)
assertion_func(node2_conn.conn.secured_conn) assertion_func(node2_conn.muxed_conn.secured_conn)
# Success, terminate pending tasks. # Success, terminate pending tasks.