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

connecting open_stream to stream constructor

Browse Source
This commit is contained in:
Alex Haynes 2018-11-11 11:52:26 -05:00
parent 7d4227f269
commit 65fe2e400e
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
muxer/mplex/muxed_connection.py
View File

@ -1,4 +1,5 @@
from .muxed_connection_interface import IMuxedConn
from transport.stream.Stream import Stream
class MuxedConn(IMuxedConn):
"""
@ -26,12 +27,14 @@ class MuxedConn(IMuxedConn):
"""
pass
def open_stream(self, protocol_id, stream_name):
def open_stream(self, protocol_id, stream_name, peer_id, multi_addr):
"""
creates a new muxed_stream
:return: a new stream
"""
pass
return Stream(peer_id, multi_addr, self)
def accept_stream(self):
"""

4
network/swarm.py
View File

@ -6,7 +6,7 @@ class Swarm(INetwork):
def __init__(self, my_peer_id, peerstore):
self.my_peer_id = my_peer_id
self.peer_store = peer_store
self.peer_store = peerstore
self.connections = {}
def set_stream_handler(self, stream_handler):
@ -41,7 +41,7 @@ class Swarm(INetwork):
muxed_connection = MuxedConnection(conn, True)
else:
raise Exception("No IP and port in addr")
return muxed_connection.open_stream(protocol_id, "")
return muxed_connection.open_stream(protocol_id, "", peer_id, addrs)
def listen(self, *args):
"""

10
transport/stream/stream.py
View File

@ -4,13 +4,17 @@ from .stream_interface import IStream
class Stream(IStream):
def __init__(self, peer_id, multi_addr, connection):
IStream.__init__(self, peer_id, multi_addr)
IStream.__init__(self, peer_id, multi_addr, connection)
self.peer_id = peer_id
stream_ip = multi_addr.get_protocol_value("ip4")
stream_port = multi_addr.get_protocol_value("tcp")
self.multi_addr = multi_addr
self.stream_ip = multi_addr.get_protocol_value("ip4")
self.stream_port = multi_addr.get_protocol_value("tcp")
self.reader = connection.reader
self.writer = connection.writer
# TODO should construct protocol id from constructor
self.protocol_id = None