StarMirror/py-libp2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make notifee functions all async

Browse Source
This commit is contained in:
Stuckinaboot 2019-02-28 19:11:04 -05:00 committed by stuckinaboot
parent 7a8878411f
commit 3e64520506
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libp2p/network/notifee_interface.py
View File

@ -1,44 +1,45 @@
import asyncio
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
class INotifee(ABC): class INotifee(ABC):
@abstractmethod @abstractmethod
def opened_stream(self, network, stream): async def opened_stream(self, network, stream):
""" """
:param network: network the stream was opened on :param network: network the stream was opened on
:param stream: stream that was opened :param stream: stream that was opened
""" """
@abstractmethod @abstractmethod
def closed_stream(self, network, stream): async def closed_stream(self, network, stream):
""" """
:param network: network the stream was closed on :param network: network the stream was closed on
:param stream: stream that was closed :param stream: stream that was closed
""" """
@abstractmethod @abstractmethod
def connected(self, network, conn): async def connected(self, network, conn):
""" """
:param network: network the connection was opened on :param network: network the connection was opened on
:param conn: connection that was opened :param conn: connection that was opened
""" """
@abstractmethod @abstractmethod
def disconnected(self, network, conn): async def disconnected(self, network, conn):
""" """
:param network: network the connection was closed on :param network: network the connection was closed on
:param conn: connection that was closed :param conn: connection that was closed
""" """
@abstractmethod @abstractmethod
def listen(self, network, multiaddr): async def listen(self, network, multiaddr):
""" """
:param network: network the listener is listening on :param network: network the listener is listening on
:param multiaddr: multiaddress listener is listening on :param multiaddr: multiaddress listener is listening on
""" """
@abstractmethod @abstractmethod
def listen_close(self, network, multiaddr): async def listen_close(self, network, multiaddr):
""" """
:param network: network the connection was opened on :param network: network the connection was opened on
:param multiaddr: multiaddress listener is no longer listening on :param multiaddr: multiaddress listener is no longer listening on

8
libp2p/network/swarm.py
View File

@ -76,7 +76,7 @@ class Swarm(INetwork):
# Call notifiers since event occurred # Call notifiers since event occurred
for notifee in self.notifees: for notifee in self.notifees:
notifee.connected(self, muxed_conn) await notifee.connected(self, muxed_conn)
return muxed_conn return muxed_conn
@ -110,7 +110,7 @@ class Swarm(INetwork):
# Call notifiers since event occurred # Call notifiers since event occurred
for notifee in self.notifees: for notifee in self.notifees:
notifee.opened_stream(self, net_stream) await notifee.opened_stream(self, net_stream)
return net_stream return net_stream
@ -151,7 +151,7 @@ class Swarm(INetwork):
# Call notifiers since event occurred # Call notifiers since event occurred
for notifee in self.notifees: for notifee in self.notifees:
notifee.connected(self, muxed_conn) await notifee.connected(self, muxed_conn)
try: try:
# Success # Success
@ -161,7 +161,7 @@ class Swarm(INetwork):
# Call notifiers since event occurred # Call notifiers since event occurred
for notifee in self.notifees: for notifee in self.notifees:
notifee.listen(self, multiaddr) await notifee.listen(self, multiaddr)
return True return True
except IOError: except IOError:

12
tests/libp2p/test_notify.py
View File

@ -28,23 +28,23 @@ class MyNotifee(INotifee):
self.events = events self.events = events
self.val_to_append_to_event = val_to_append_to_event 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.events.append(["opened_stream" + \
self.val_to_append_to_event, stream]) self.val_to_append_to_event, stream])
def closed_stream(self, network, stream): async def closed_stream(self, network, stream):
pass pass
def connected(self, network, conn): async def connected(self, network, conn):
self.events.append("connected" + self.val_to_append_to_event) self.events.append("connected" + self.val_to_append_to_event)
def disconnected(self, network, conn): async def disconnected(self, network, conn):
pass pass
def listen(self, network, multiaddr): async def listen(self, network, multiaddr):
pass pass
def listen_close(self, network, multiaddr): async def listen_close(self, network, multiaddr):
pass pass
@pytest.mark.asyncio @pytest.mark.asyncio