Add test for notifee disconnected

libp2p/host/basic_host.py

@@ -100,7 +100,7 @@ class BasicHost(IHost):
         :return: stream: new stream created
         """
 
-        net_stream = await self._network.new_stream(peer_id, protocol_ids)
+        net_stream = await self._network.new_stream(peer_id)
 
         # Perform protocol muxing to determine protocol to use
         selected_protocol = await self.multiselect_client.select_one_of(

libp2p/network/network_interface.py

@@ -7,7 +7,7 @@ from libp2p.network.connection.net_connection_interface import INetConn
 from libp2p.peer.id import ID
 from libp2p.peer.peerstore_interface import IPeerStore
 from libp2p.transport.listener_interface import IListener
-from libp2p.typing import StreamHandlerFn, TProtocol
+from libp2p.typing import StreamHandlerFn
 
 from .stream.net_stream_interface import INetStream
 
@@ -38,9 +38,7 @@ class INetwork(ABC):
         """
 
     @abstractmethod
-    async def new_stream(
-        self, peer_id: ID, protocol_ids: Sequence[TProtocol]
-    ) -> INetStream:
+    async def new_stream(self, peer_id: ID) -> INetStream:
         """
         :param peer_id: peer_id of destination
         :param protocol_ids: available protocol ids to use for stream
@@ -61,7 +59,7 @@ class INetwork(ABC):
         """
 
     @abstractmethod
-    def notify(self, notifee: "INotifee") -> bool:
+    def register_notifee(self, notifee: "INotifee") -> None:
         """
         :param notifee: object implementing Notifee interface
         :return: true if notifee registered successfully, false otherwise

libp2p/network/swarm.py

@@ -1,6 +1,6 @@
 import asyncio
 import logging
-from typing import Dict, List, Optional, Sequence
+from typing import Dict, List, Optional
 
 from multiaddr import Multiaddr
 
@@ -14,7 +14,7 @@ from libp2p.transport.exceptions import MuxerUpgradeFailure, SecurityUpgradeFail
 from libp2p.transport.listener_interface import IListener
 from libp2p.transport.transport_interface import ITransport
 from libp2p.transport.upgrader import TransportUpgrader
-from libp2p.typing import StreamHandlerFn, TProtocol
+from libp2p.typing import StreamHandlerFn
 
 from .connection.raw_connection import RawConnection
 from .connection.swarm_connection import SwarmConn
@@ -131,9 +131,7 @@ class Swarm(INetwork):
 
         return swarm_conn
 
-    async def new_stream(
-        self, peer_id: ID, protocol_ids: Sequence[TProtocol]
-    ) -> INetStream:
+    async def new_stream(self, peer_id: ID) -> INetStream:
         """
         :param peer_id: peer_id of destination
         :param protocol_id: protocol id
@@ -229,15 +227,12 @@ class Swarm(INetwork):
         # No maddr succeeded
         return False
 
-    def notify(self, notifee: INotifee) -> bool:
+    def register_notifee(self, notifee: INotifee) -> None:
         """
         :param notifee: object implementing Notifee interface
         :return: true if notifee registered successfully, false otherwise
         """
-        if isinstance(notifee, INotifee):
-            self.notifees.append(notifee)
-            return True
-        return False
+        self.notifees.append(notifee)
 
     def add_router(self, router: IPeerRouting) -> None:
         self.router = router

libp2p/pubsub/pubsub.py

@@ -95,7 +95,7 @@ class Pubsub:
 
         # Register a notifee
         self.peer_queue = asyncio.Queue()
-        self.host.get_network().notify(PubsubNotifee(self.peer_queue))
+        self.host.get_network().register_notifee(PubsubNotifee(self.peer_queue))
 
         # Register stream handlers for each pubsub router protocol to handle
         # the pubsub streams opened on those protocols