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

Merge branch 'master' into upgrader

Browse Source
This commit is contained in:
Alex Haynes 2018-11-11 19:43:16 -05:00 committed by GitHub
commit d149bfb0d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
muxer/mplex/smux_multiplex.py
View File

@ -8,7 +8,7 @@ class Multiplex(object):
def __init__(self, conn, initiator): def __init__(self, conn, initiator):
""" """
:param conn: an instance of raw connection :param conn: an instance of raw connection
: param initiator: boolean to prevent multiplex with self :param initiator: boolean to prevent multiplex with self
""" """
self.muxed_conn = MuxedConn(conn, initiator) self.muxed_conn = MuxedConn(conn, initiator)

3
transport/upgrader.py
View File

@ -22,8 +22,7 @@ class TransportUpgrader(object):
""" """
# For PoC, no security # For PoC, no security
# Default to mplex # Default to mplex
# TODO do exchange to determine multiplexer # TODO do exchange to determine multiplexer
return MuxedConn(conn, initiator) return MuxedConn(conn, initiator)