Add SubscriptionAPI

And `TrioSubscriptionAPI`, to make subscription io-agnostic.

libp2p/tools/factories.py

@@ -17,10 +17,10 @@ from libp2p.network.stream.net_stream_interface import INetStream
 from libp2p.network.swarm import Swarm
 from libp2p.peer.id import ID
 from libp2p.peer.peerstore import PeerStore
+from libp2p.pubsub.abc import IPubsubRouter
 from libp2p.pubsub.floodsub import FloodSub
 from libp2p.pubsub.gossipsub import GossipSub
 from libp2p.pubsub.pubsub import Pubsub
-from libp2p.pubsub.pubsub_router_interface import IPubsubRouter
 from libp2p.security.base_transport import BaseSecureTransport
 from libp2p.security.insecure.transport import PLAINTEXT_PROTOCOL_ID, InsecureTransport
 import libp2p.security.secio.transport as secio

libp2p/tools/pubsub/dummy_account_node.py

@@ -61,7 +61,7 @@ class DummyAccountNode(Service):
     async def handle_incoming_msgs(self) -> None:
         """Handle all incoming messages on the CRYPTO_TOPIC from peers."""
         while True:
-            incoming = await self.subscription.receive()
+            incoming = await self.subscription.get()
             msg_comps = incoming.data.decode("utf-8").split(",")
 
             if msg_comps[0] == "send":

libp2p/tools/pubsub/floodsub_integration_test_settings.py

@@ -250,7 +250,7 @@ async def perform_test_from_obj(obj, pubsub_factory) -> None:
             # Look at each node in each topic
             for node_id in topic_map[topic]:
                 # Get message from subscription queue
-                msg = await queues_map[node_id][topic].receive()
+                msg = await queues_map[node_id][topic].get()
                 assert data == msg.data
                 # Check the message origin
                 assert node_map[origin_node_id].get_id().to_bytes() == msg.from_id