varun-r-mallya/py-libp2p
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/py-libp2p.git synced 2026-02-10 07:00:54 +00:00
Code Issues Packages 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
7 changed files with 15 additions and 13 deletions
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):
conn: IMuxedConn
muxed_conn: IMuxedConn
@abstractmethod
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):
conn: IMuxedConn
muxed_conn: IMuxedConn
swarm: "Swarm"
streams: Set[NetStream]
event_closed: asyncio.Event
_tasks: List["asyncio.Future[Any]"]
def __init__(self, conn: IMuxedConn, swarm: "Swarm") -> None:
self.conn = conn
def __init__(self, muxed_conn: IMuxedConn, swarm: "Swarm") -> None:
self.muxed_conn = muxed_conn
self.swarm = swarm
self.streams = set()
self.event_closed = asyncio.Event()
@ -37,7 +37,7 @@ class SwarmConn(INetConn):
self.event_closed.set()
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.
# 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:
while True:
try:
stream = await self.conn.accept_stream()
stream = await self.muxed_conn.accept_stream()
except MuxedConnUnavailable:
# If there is anything wrong in the MuxedConn,
# we should break the loop and close the connection.
@ -96,7 +96,7 @@ class SwarmConn(INetConn):
self._tasks.append(asyncio.ensure_future(coro))
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)
async def get_streams(self) -> Tuple[NetStream, ...]: