move pubsub testing tools into tests/utils

tests/core/pubsub/test_dummyaccount_demo.py

@@ -1,12 +1,12 @@
 import pytest
 import trio
 
-from libp2p.tools.pubsub.dummy_account_node import (
-    DummyAccountNode,
-)
 from libp2p.tools.utils import (
     connect,
 )
+from tests.utils.pubsub.dummy_account_node import (
+    DummyAccountNode,
+)
 
 
 async def perform_test(num_nodes, adjacency_map, action_func, assertion_func):

tests/core/pubsub/test_floodsub.py

@@ -6,16 +6,16 @@ import trio
 from libp2p.peer.id import (
     ID,
 )
-from libp2p.tools.pubsub.floodsub_integration_test_settings import (
-    floodsub_protocol_pytest_params,
-    perform_test_from_obj,
-)
 from libp2p.tools.utils import (
     connect,
 )
 from tests.utils.factories import (
     PubsubFactory,
 )
+from tests.utils.pubsub.floodsub_integration_test_settings import (
+    floodsub_protocol_pytest_params,
+    perform_test_from_obj,
+)
 
 
 @pytest.mark.trio

tests/core/pubsub/test_gossipsub.py

@@ -6,10 +6,6 @@ import trio
 from libp2p.pubsub.gossipsub import (
     PROTOCOL_ID,
 )
-from libp2p.tools.pubsub.utils import (
-    dense_connect,
-    one_to_all_connect,
-)
 from libp2p.tools.utils import (
     connect,
 )
@@ -17,6 +13,10 @@ from tests.utils.factories import (
     IDFactory,
     PubsubFactory,
 )
+from tests.utils.pubsub.utils import (
+    dense_connect,
+    one_to_all_connect,
+)
 
 
 @pytest.mark.trio

tests/core/pubsub/test_gossipsub_backward_compatibility.py

@@ -5,13 +5,13 @@ import pytest
 from libp2p.tools.constants import (
     FLOODSUB_PROTOCOL_ID,
 )
-from libp2p.tools.pubsub.floodsub_integration_test_settings import (
-    floodsub_protocol_pytest_params,
-    perform_test_from_obj,
-)
 from tests.utils.factories import (
     PubsubFactory,
 )
+from tests.utils.pubsub.floodsub_integration_test_settings import (
+    floodsub_protocol_pytest_params,
+    perform_test_from_obj,
+)
 
 
 @pytest.mark.parametrize("test_case_obj", floodsub_protocol_pytest_params)

tests/core/pubsub/test_pubsub.py

@@ -21,9 +21,6 @@ from libp2p.pubsub.pubsub import (
 from libp2p.tools.constants import (
     MAX_READ_LEN,
 )
-from libp2p.tools.pubsub.utils import (
-    make_pubsub_msg,
-)
 from libp2p.tools.utils import (
     connect,
 )
@@ -35,6 +32,9 @@ from tests.utils.factories import (
     PubsubFactory,
     net_stream_pair_factory,
 )
+from tests.utils.pubsub.utils import (
+    make_pubsub_msg,
+)
 
 TESTING_TOPIC = "TEST_SUBSCRIBE"
 TESTING_DATA = b"data"