varun-r-mallya/py-libp2p
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/py-libp2p.git synced 2025-12-31 20:36:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

makes test_mplex_stream.py::test_mplex_stream_read_write work

Browse Source
This commit is contained in:
Chih Cheng Liang
2019-11-19 18:04:48 +08:00
committed by mhchia
parent c55ea0e5bb
commit a397ccdc04
13 changed files with 70 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libp2p/network/connection/raw_connection.py
View File

@ -1,9 +1,10 @@
import trio
from libp2p.io.abc import ReadWriteCloser
from libp2p.io.exceptions import IOException
from .exceptions import RawConnError
from .raw_connection_interface import IRawConnection
from libp2p.io.abc import ReadWriteCloser
class RawConnection(IRawConnection):

12
libp2p/network/swarm.py
View File

@ -3,6 +3,7 @@ import logging
from typing import Dict, List, Optional
from multiaddr import Multiaddr
import trio
from libp2p.io.abc import ReadWriteCloser
from libp2p.network.connection.net_connection_interface import INetConn
@ -69,7 +70,7 @@ class Swarm(INetwork):
def set_stream_handler(self, stream_handler: StreamHandlerFn) -> None:
self.common_stream_handler = stream_handler
async def dial_peer(self, peer_id: ID) -> INetConn:
async def dial_peer(self, peer_id: ID, nursery) -> INetConn:
"""
dial_peer try to create a connection to peer_id.
@ -121,6 +122,7 @@ class Swarm(INetwork):
try:
muxed_conn = await self.upgrader.upgrade_connection(secured_conn, peer_id)
muxed_conn.run(nursery)
except MuxerUpgradeFailure as error:
error_msg = "fail to upgrade mux for peer %s"
logger.debug(error_msg, peer_id)
@ -135,7 +137,7 @@ class Swarm(INetwork):
return swarm_conn
async def new_stream(self, peer_id: ID) -> INetStream:
async def new_stream(self, peer_id: ID, nursery) -> INetStream:
"""
:param peer_id: peer_id of destination
:param protocol_id: protocol id
@ -144,7 +146,7 @@ class Swarm(INetwork):
"""
logger.debug("attempting to open a stream to peer %s", peer_id)
swarm_conn = await self.dial_peer(peer_id)
swarm_conn = await self.dial_peer(peer_id, nursery)
net_stream = await swarm_conn.new_stream()
logger.debug("successfully opened a stream to peer %s", peer_id)
@ -183,11 +185,11 @@ class Swarm(INetwork):
raise SwarmException() from error
peer_id = secured_conn.get_remote_peer()
try:
muxed_conn = await self.upgrader.upgrade_connection(
secured_conn, peer_id
)
muxed_conn.run(nursery)
except MuxerUpgradeFailure as error:
error_msg = "fail to upgrade mux for peer %s"
logger.debug(error_msg, peer_id)
@ -198,6 +200,8 @@ class Swarm(INetwork):
await self.add_conn(muxed_conn)
logger.debug("successfully opened connection to peer %s", peer_id)
event = trio.Event()
await event.wait()
try:
# Success