Initial commit

Author: lla-dane

tests/core/pubsub/test_gossipsub.py

@@ -604,7 +604,7 @@ async def test_sparse_connect():
 async def test_connect_some_with_fewer_hosts_than_degree():
     """Test connect_some when there are fewer hosts than degree."""
     # Create 3 hosts with degree=5
-    async with PubsubFactory.create_batch_with_floodsub(3) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(3) as pubsubs_fsub:
         hosts = [pubsub.host for pubsub in pubsubs_fsub]
         degree = 5
 
@@ -625,7 +625,7 @@ async def test_connect_some_with_fewer_hosts_than_degree():
 async def test_connect_some_degree_limit_enforced():
     """Test that connect_some enforces degree limits and creates expected topology."""
     # Test with small network where we can verify exact behavior
-    async with PubsubFactory.create_batch_with_floodsub(6) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(6) as pubsubs_fsub:
         hosts = [pubsub.host for pubsub in pubsubs_fsub]
         degree = 2
 
@@ -673,7 +673,7 @@ async def test_connect_some_degree_limit_enforced():
 async def test_connect_some_degree_zero():
     """Test edge case: degree=0 should result in no connections."""
     # Create 5 hosts with degree=0
-    async with PubsubFactory.create_batch_with_floodsub(5) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(5) as pubsubs_fsub:
         hosts = [pubsub.host for pubsub in pubsubs_fsub]
         degree = 0
 
@@ -693,7 +693,7 @@ async def test_connect_some_degree_zero():
 async def test_connect_some_negative_degree():
     """Test edge case: negative degree should be handled gracefully."""
     # Create 5 hosts with degree=-1
-    async with PubsubFactory.create_batch_with_floodsub(5) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(5) as pubsubs_fsub:
         hosts = [pubsub.host for pubsub in pubsubs_fsub]
         degree = -1
 
@@ -712,7 +712,7 @@ async def test_connect_some_negative_degree():
 @pytest.mark.trio
 async def test_sparse_connect_degree_zero():
     """Test sparse_connect with degree=0."""
-    async with PubsubFactory.create_batch_with_floodsub(8) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(8) as pubsubs_fsub:
         hosts = [pubsub.host for pubsub in pubsubs_fsub]
         degree = 0
 
@@ -748,7 +748,7 @@ async def test_empty_host_list():
 @pytest.mark.trio
 async def test_single_host():
     """Test edge case: single host should be handled gracefully."""
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
         hosts = [pubsub.host for pubsub in pubsubs_fsub]
 
         # All functions should handle single host gracefully

tests/core/pubsub/test_pubsub.py

@@ -55,7 +55,7 @@
 
 @pytest.mark.trio
 async def test_subscribe_and_unsubscribe():
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
         await pubsubs_fsub[0].subscribe(TESTING_TOPIC)
         assert TESTING_TOPIC in pubsubs_fsub[0].topic_ids
 
@@ -65,7 +65,7 @@ async def test_subscribe_and_unsubscribe():
 
 @pytest.mark.trio
 async def test_re_subscribe():
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
         await pubsubs_fsub[0].subscribe(TESTING_TOPIC)
         assert TESTING_TOPIC in pubsubs_fsub[0].topic_ids
 
@@ -75,7 +75,7 @@ async def test_re_subscribe():
 
 @pytest.mark.trio
 async def test_re_unsubscribe():
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
         # Unsubscribe from topic we didn't even subscribe to
         assert "NOT_MY_TOPIC" not in pubsubs_fsub[0].topic_ids
         await pubsubs_fsub[0].unsubscribe("NOT_MY_TOPIC")
@@ -93,7 +93,7 @@ async def test_re_unsubscribe():
 
 @pytest.mark.trio
 async def test_reissue_when_listen_addrs_change():
-    async with PubsubFactory.create_batch_with_floodsub(2) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(2) as pubsubs_fsub:
         await connect(pubsubs_fsub[0].host, pubsubs_fsub[1].host)
         await pubsubs_fsub[0].subscribe(TESTING_TOPIC)
         # Yield to let 0 notify 1
@@ -132,7 +132,7 @@ async def test_reissue_when_listen_addrs_change():
 
 @pytest.mark.trio
 async def test_peers_subscribe():
-    async with PubsubFactory.create_batch_with_floodsub(2) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(2) as pubsubs_fsub:
         await connect(pubsubs_fsub[0].host, pubsubs_fsub[1].host)
         await pubsubs_fsub[0].subscribe(TESTING_TOPIC)
         # Yield to let 0 notify 1
@@ -166,7 +166,7 @@ async def test_peers_subscribe():
 
 @pytest.mark.trio
 async def test_peer_subscribe_fail_upon_invald_record_transfer():
-    async with PubsubFactory.create_batch_with_floodsub(2) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(2) as pubsubs_fsub:
         await connect(pubsubs_fsub[0].host, pubsubs_fsub[1].host)
 
         # Corrupt host_a's local peer record
@@ -206,7 +206,7 @@ async def test_peer_subscribe_fail_upon_invald_record_transfer():
 
 @pytest.mark.trio
 async def test_get_hello_packet():
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
 
         def _get_hello_packet_topic_ids():
             packet = pubsubs_fsub[0].get_hello_packet()
@@ -227,7 +227,7 @@ def _get_hello_packet_topic_ids():
 
 @pytest.mark.trio
 async def test_set_and_remove_topic_validator():
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
         is_sync_validator_called = False
 
         def sync_validator(peer_id: ID, msg: rpc_pb2.Message) -> bool:
@@ -311,7 +311,7 @@ async def async_validator(peer_id: ID, msg: rpc_pb2.Message) -> bool:
         await trio.lowlevel.checkpoint()
         return True
 
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
         topic_1 = "TEST_VALIDATOR_1"
         topic_2 = "TEST_VALIDATOR_2"
         topic_3 = "TEST_VALIDATOR_3"
@@ -379,7 +379,7 @@ async def mock_run_async_validator(
                 async with lock:
                     state["concurrency_counter"] -= 1
 
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
 
         def passed_sync_validator(peer_id: ID, msg: rpc_pb2.Message) -> bool:
             return True
@@ -466,7 +466,7 @@ async def mock_handle_rpc(rpc, sender_peer_id):
             yield Events(event_push_msg, event_handle_subscription, event_handle_rpc)
 
     async with (
-        PubsubFactory.create_batch_with_floodsub(
+        PubsubFactory.create_batch_with_gossipsub(
             1, security_protocol=security_protocol
         ) as pubsubs_fsub,
         net_stream_pair_factory(security_protocol=security_protocol) as stream_pair,
@@ -541,7 +541,7 @@ async def mock_handle_rpc(rpc, sender_peer_id):
 
 @pytest.mark.trio
 async def test_handle_subscription():
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
         assert len(pubsubs_fsub[0].peer_topics) == 0
         sub_msg_0 = rpc_pb2.RPC.SubOpts(subscribe=True, topicid=TESTING_TOPIC)
         peer_ids = [IDFactory() for _ in range(2)]
@@ -573,7 +573,7 @@ async def test_handle_subscription():
 
 @pytest.mark.trio
 async def test_handle_talk():
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
         sub = await pubsubs_fsub[0].subscribe(TESTING_TOPIC)
         msg_0 = make_pubsub_msg(
             origin_id=pubsubs_fsub[0].my_id,
@@ -599,7 +599,7 @@ async def test_handle_talk():
 @pytest.mark.trio
 async def test_message_all_peers(monkeypatch, security_protocol):
     async with (
-        PubsubFactory.create_batch_with_floodsub(
+        PubsubFactory.create_batch_with_gossipsub(
             1, security_protocol=security_protocol
         ) as pubsubs_fsub,
         net_stream_pair_factory(security_protocol=security_protocol) as stream_pair,
@@ -620,7 +620,7 @@ async def test_message_all_peers(monkeypatch, security_protocol):
 
 @pytest.mark.trio
 async def test_subscribe_and_publish():
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
         pubsub = pubsubs_fsub[0]
 
         list_data = [b"d0", b"d1"]
@@ -652,7 +652,7 @@ async def receive_data(topic):
 
 @pytest.mark.trio
 async def test_subscribe_and_publish_full_channel():
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
         pubsub = pubsubs_fsub[0]
 
         extra_data_0 = b"extra_data_0"
@@ -693,7 +693,7 @@ async def push_msg(msg_forwarder, msg):
         msgs.append(msg)
         await trio.lowlevel.checkpoint()
 
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
         with monkeypatch.context() as m:
             m.setattr(pubsubs_fsub[0], "push_msg", push_msg)
 
@@ -713,7 +713,7 @@ async def push_msg(msg_forwarder, msg):
 
 @pytest.mark.trio
 async def test_push_msg(monkeypatch):
-    async with PubsubFactory.create_batch_with_floodsub(2) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(2) as pubsubs_fsub:
         msg_0 = make_pubsub_msg(
             origin_id=pubsubs_fsub[0].my_id,
             topic_ids=[TESTING_TOPIC],
@@ -802,7 +802,7 @@ def failed_sync_validator(peer_id: ID, msg: rpc_pb2.Message) -> bool:
 
 @pytest.mark.trio
 async def test_strict_signing():
-    async with PubsubFactory.create_batch_with_floodsub(
+    async with PubsubFactory.create_batch_with_gossipsub(
         2, strict_signing=True
     ) as pubsubs_fsub:
         await connect(pubsubs_fsub[0].host, pubsubs_fsub[1].host)
@@ -819,7 +819,7 @@ async def test_strict_signing():
 
 @pytest.mark.trio
 async def test_strict_signing_failed_validation(monkeypatch):
-    async with PubsubFactory.create_batch_with_floodsub(
+    async with PubsubFactory.create_batch_with_gossipsub(
         2, strict_signing=True
     ) as pubsubs_fsub:
         msg = make_pubsub_msg(
@@ -880,7 +880,7 @@ async def router_publish(*args, **kwargs):
 @pytest.mark.trio
 async def test_blacklist_basic_operations():
     """Test basic blacklist operations: add, remove, check, clear."""
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
         pubsub = pubsubs_fsub[0]
 
         # Create test peer IDs
@@ -936,7 +936,7 @@ async def test_blacklist_basic_operations():
 @pytest.mark.trio
 async def test_blacklist_blocks_new_peer_connections(monkeypatch):
     """Test that blacklisted peers are rejected when trying to connect."""
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
         pubsub = pubsubs_fsub[0]
 
         # Create a blacklisted peer ID
@@ -990,7 +990,7 @@ def mock_add_peer(*args, **kwargs):
 @pytest.mark.trio
 async def test_blacklist_blocks_messages_from_blacklisted_originator():
     """Test that messages from blacklisted originator (from field) are rejected."""
-    async with PubsubFactory.create_batch_with_floodsub(2) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(2) as pubsubs_fsub:
         pubsub = pubsubs_fsub[0]
         blacklisted_originator = pubsubs_fsub[1].my_id  # Use existing peer ID
 
@@ -1038,7 +1038,7 @@ async def mock_router_publish(msg_forwarder: ID, pubsub_msg: rpc_pb2.Message):
 @pytest.mark.trio
 async def test_blacklist_allows_non_blacklisted_peers():
     """Test that non-blacklisted peers can send messages normally."""
-    async with PubsubFactory.create_batch_with_floodsub(3) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(3) as pubsubs_fsub:
         pubsub = pubsubs_fsub[0]
         allowed_peer = pubsubs_fsub[1].my_id
         blacklisted_peer = pubsubs_fsub[2].my_id
@@ -1103,7 +1103,7 @@ async def mock_router_publish(msg_forwarder: ID, pubsub_msg: rpc_pb2.Message):
 @pytest.mark.trio
 async def test_blacklist_integration_with_existing_functionality():
     """Test that blacklisting works correctly with existing pubsub functionality."""
-    async with PubsubFactory.create_batch_with_floodsub(2) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(2) as pubsubs_fsub:
         pubsub = pubsubs_fsub[0]
         other_peer = pubsubs_fsub[1].my_id
 
@@ -1153,7 +1153,7 @@ async def mock_router_publish(msg_forwarder: ID, pubsub_msg: rpc_pb2.Message):
 @pytest.mark.trio
 async def test_blacklist_blocks_messages_from_blacklisted_source():
     """Test that messages from blacklisted source (forwarder) are rejected."""
-    async with PubsubFactory.create_batch_with_floodsub(2) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(2) as pubsubs_fsub:
         pubsub = pubsubs_fsub[0]
         blacklisted_forwarder = pubsubs_fsub[1].my_id
 
@@ -1205,8 +1205,9 @@ async def test_blacklist_tears_down_existing_connection():
     calling add_to_blacklist(peer_id) immediately resets its stream and
     removes it from both places.
     """
-    # Create two pubsub instances (floodsub), so they can connect to each other
-    async with PubsubFactory.create_batch_with_floodsub(2) as pubsubs_fsub:
+    # Create two pubsub instances (gosscreate_batch_with_gossipsub),
+    # so they can connect to each other
+    async with PubsubFactory.create_batch_with_gossipsub(2) as pubsubs_fsub:
         pubsub0, pubsub1 = pubsubs_fsub
 
         # 1) Connect peer1 to peer0
@@ -1246,7 +1247,7 @@ async def test_blacklist_tears_down_existing_connection():
 @pytest.mark.trio
 async def test_get_message_id():
     """Test that the get_message_id method provides correct message ID construction."""
-    async with PubsubFactory.create_batch_with_floodsub(1) as pubsubs_fsub:
+    async with PubsubFactory.create_batch_with_gossipsub(1) as pubsubs_fsub:
         pubsub = pubsubs_fsub[0]
 
         # Create a test message
@@ -1268,7 +1269,7 @@ def custom_msg_id_constructor(msg):
             return msg.data + msg.from_id
 
         # Create a new pubsub instance with custom constructor
-        async with PubsubFactory.create_batch_with_floodsub(
+        async with PubsubFactory.create_batch_with_gossipsub(
             1, msg_id_constructor=custom_msg_id_constructor
         ) as custom_pubsubs:
             custom_pubsub = custom_pubsubs[0]

tests/core/pubsub/test_pubsub_notifee_integration.py

@@ -9,7 +9,7 @@
 
 @pytest.mark.trio
 async def test_connected_enqueues_and_adds_peer():
-    async with PubsubFactory.create_batch_with_floodsub(2) as (p0, p1):
+    async with PubsubFactory.create_batch_with_gossipsub(2) as (p0, p1):
         await connect(p0.host, p1.host)
         await p0.wait_until_ready()
         # Wait until peer is added via queue processing
@@ -21,7 +21,7 @@ async def test_connected_enqueues_and_adds_peer():
 
 @pytest.mark.trio
 async def test_disconnected_enqueues_and_removes_peer():
-    async with PubsubFactory.create_batch_with_floodsub(2) as (p0, p1):
+    async with PubsubFactory.create_batch_with_gossipsub(2) as (p0, p1):
         await connect(p0.host, p1.host)
         await p0.wait_until_ready()
         # Ensure present first
@@ -39,7 +39,7 @@ async def test_disconnected_enqueues_and_removes_peer():
 @pytest.mark.trio
 async def test_channel_closed_is_swallowed_in_notifee(monkeypatch) -> None:
     # Ensure PubsubNotifee catches BrokenResourceError from its send channel
-    async with PubsubFactory.create_batch_with_floodsub(2) as (p0, p1):
+    async with PubsubFactory.create_batch_with_gossipsub(2) as (p0, p1):
         # Find the PubsubNotifee registered on the network
         from libp2p.pubsub.pubsub_notifee import PubsubNotifee
 
@@ -66,7 +66,7 @@ async def failing_send(_peer_id):  # type: ignore[no-redef]
 
 @pytest.mark.trio
 async def test_duplicate_connection_does_not_duplicate_peer_state():
-    async with PubsubFactory.create_batch_with_floodsub(2) as (p0, p1):
+    async with PubsubFactory.create_batch_with_gossipsub(2) as (p0, p1):
         await connect(p0.host, p1.host)
         await p0.wait_until_ready()
         with trio.fail_after(1.0):
@@ -80,7 +80,7 @@ async def test_duplicate_connection_does_not_duplicate_peer_state():
 
 @pytest.mark.trio
 async def test_blacklist_blocks_peer_added_by_notifee():
-    async with PubsubFactory.create_batch_with_floodsub(2) as (p0, p1):
+    async with PubsubFactory.create_batch_with_gossipsub(2) as (p0, p1):
         # Blacklist before connecting
         p0.add_to_blacklist(p1.my_id)
         await connect(p0.host, p1.host)