Updated code to use multistream_select package

libp2p · Dec 30, 2018 · a6768e0 · a6768e0
1 parent 9cfe26f
commit a6768e0
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 316 deletions.
diff --git a/network/swarm.py b/network/swarm.py
@@ -1,5 +1,5 @@
-from protocol_muxer.multiselect_client import MultiselectClient
-from protocol_muxer.multiselect import Multiselect
+from multistream_select.multiselect_client import MultiselectClient
+from multistream_select.multiselect import Multiselect
 from .network_interface import INetwork
 from .stream.net_stream import NetStream
 from .connection.raw_connection import RawConnection

diff --git a/protocol_muxer/__init__.py b/protocol_muxer/__init__.py
diff --git a/protocol_muxer/multiselect.py b/protocol_muxer/multiselect.py
diff --git a/protocol_muxer/multiselect_client.py b/protocol_muxer/multiselect_client.py
diff --git a/protocol_muxer/multiselect_client_interface.py b/protocol_muxer/multiselect_client_interface.py
diff --git a/protocol_muxer/multiselect_communicator.py b/protocol_muxer/multiselect_communicator.py
diff --git a/protocol_muxer/multiselect_communicator_interface.py b/protocol_muxer/multiselect_communicator_interface.py
diff --git a/protocol_muxer/multiselect_muxer_interface.py b/protocol_muxer/multiselect_muxer_interface.py
diff --git a/requirements.txt b/requirements.txt
@@ -7,3 +7,4 @@ click
 base58
 pymultihash
 multiaddr
+multistream-select
diff --git a/tests/examples/test_chat.py b/tests/examples/test_chat.py
@@ -8,7 +8,7 @@
 
 from libp2p.libp2p import *
 from peer.peerinfo import info_from_p2p_addr
-from protocol_muxer.multiselect_client import MultiselectClientError
+from multistream_select.multiselect_client import MultiselectClientError
 
 PROTOCOL_ID = '/chat/1.0.0'
 

diff --git a/tests/protocol_muxer/test_protocol_muxer.py b/tests/protocol_muxer/test_protocol_muxer.py
@@ -1,7 +1,8 @@
 import pytest
 
+from multistream_select.multiselect_client import MultiselectClientError
 from libp2p.libp2p import new_node
-from protocol_muxer.multiselect_client import MultiselectClientError
+
 
 # TODO: Add tests for multiple streams being opened on different
 # protocols through the same connection