diff --git a/libp2p/network/notifee_interface.py b/libp2p/network/notifee_interface.py index 4ce9ed5..837ecd1 100644 --- a/libp2p/network/notifee_interface.py +++ b/libp2p/network/notifee_interface.py @@ -1,44 +1,45 @@ +import asyncio from abc import ABC, abstractmethod class INotifee(ABC): @abstractmethod - def opened_stream(self, network, stream): + async def opened_stream(self, network, stream): """ :param network: network the stream was opened on :param stream: stream that was opened """ @abstractmethod - def closed_stream(self, network, stream): + async def closed_stream(self, network, stream): """ :param network: network the stream was closed on :param stream: stream that was closed """ @abstractmethod - def connected(self, network, conn): + async def connected(self, network, conn): """ :param network: network the connection was opened on :param conn: connection that was opened """ @abstractmethod - def disconnected(self, network, conn): + async def disconnected(self, network, conn): """ :param network: network the connection was closed on :param conn: connection that was closed """ @abstractmethod - def listen(self, network, multiaddr): + async def listen(self, network, multiaddr): """ :param network: network the listener is listening on :param multiaddr: multiaddress listener is listening on """ @abstractmethod - def listen_close(self, network, multiaddr): + async def listen_close(self, network, multiaddr): """ :param network: network the connection was opened on :param multiaddr: multiaddress listener is no longer listening on diff --git a/libp2p/network/swarm.py b/libp2p/network/swarm.py index 1ecc0df..e6bf288 100644 --- a/libp2p/network/swarm.py +++ b/libp2p/network/swarm.py @@ -76,7 +76,7 @@ class Swarm(INetwork): # Call notifiers since event occurred for notifee in self.notifees: - notifee.connected(self, muxed_conn) + await notifee.connected(self, muxed_conn) return muxed_conn @@ -110,7 +110,7 @@ class Swarm(INetwork): # Call notifiers since event occurred for notifee in self.notifees: - notifee.opened_stream(self, net_stream) + await notifee.opened_stream(self, net_stream) return net_stream @@ -151,7 +151,7 @@ class Swarm(INetwork): # Call notifiers since event occurred for notifee in self.notifees: - notifee.connected(self, muxed_conn) + await notifee.connected(self, muxed_conn) try: # Success @@ -161,7 +161,7 @@ class Swarm(INetwork): # Call notifiers since event occurred for notifee in self.notifees: - notifee.listen(self, multiaddr) + await notifee.listen(self, multiaddr) return True except IOError: diff --git a/tests/libp2p/test_notify.py b/tests/libp2p/test_notify.py index 1df267c..05b2c4f 100644 --- a/tests/libp2p/test_notify.py +++ b/tests/libp2p/test_notify.py @@ -28,23 +28,23 @@ class MyNotifee(INotifee): self.events = events self.val_to_append_to_event = val_to_append_to_event - def opened_stream(self, network, stream): + async def opened_stream(self, network, stream): self.events.append(["opened_stream" + \ self.val_to_append_to_event, stream]) - def closed_stream(self, network, stream): + async def closed_stream(self, network, stream): pass - def connected(self, network, conn): + async def connected(self, network, conn): self.events.append("connected" + self.val_to_append_to_event) - def disconnected(self, network, conn): + async def disconnected(self, network, conn): pass - def listen(self, network, multiaddr): + async def listen(self, network, multiaddr): pass - def listen_close(self, network, multiaddr): + async def listen_close(self, network, multiaddr): pass @pytest.mark.asyncio