varun-r-mallya/py-libp2p
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/py-libp2p.git synced 2026-02-10 15:10:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change notify_xxx to sync functions

Browse Source 
Since we already have `Swarm.run_task`, we can just change notify
functions to sync.
This commit is contained in:
mhchia
2020-01-07 16:45:06 +08:00
parent 4db043a26a
commit 45eeb4fba3
2 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
libp2p/network/swarm.py
View File

@ -250,7 +250,7 @@ class Swarm(INetworkService):
await listener.listen(maddr, self.manager._task_nursery) # type: ignore
# Call notifiers since event occurred
await self.notify_listen(maddr)
self.notify_listen(maddr)
return True
except IOError:
@ -297,7 +297,7 @@ class Swarm(INetworkService):
# Store muxed_conn with peer id
self.connections[muxed_conn.peer_id] = swarm_conn
# Call notifiers since event occurred
self.manager.run_task(self.notify_connected, swarm_conn)
self.notify_connected(swarm_conn)
await manager.wait_started()
return swarm_conn
@ -320,27 +320,22 @@ class Swarm(INetworkService):
"""
self.notifees.append(notifee)
# TODO: Use `run_task`.
async def notify_opened_stream(self, stream: INetStream) -> None:
async with trio.open_nursery() as nursery:
for notifee in self.notifees:
nursery.start_soon(notifee.opened_stream, self, stream)
def notify_opened_stream(self, stream: INetStream) -> None:
for notifee in self.notifees:
self.manager.run_task(notifee.opened_stream, self, stream)
# TODO: `notify_closed_stream`
async def notify_connected(self, conn: INetConn) -> None:
async with trio.open_nursery() as nursery:
for notifee in self.notifees:
nursery.start_soon(notifee.connected, self, conn)
def notify_connected(self, conn: INetConn) -> None:
for notifee in self.notifees:
self.manager.run_task(notifee.connected, self, conn)
async def notify_disconnected(self, conn: INetConn) -> None:
async with trio.open_nursery() as nursery:
for notifee in self.notifees:
nursery.start_soon(notifee.disconnected, self, conn)
def notify_disconnected(self, conn: INetConn) -> None:
for notifee in self.notifees:
self.manager.run_task(notifee.disconnected, self, conn)
async def notify_listen(self, multiaddr: Multiaddr) -> None:
async with trio.open_nursery() as nursery:
for notifee in self.notifees:
nursery.start_soon(notifee.listen, self, multiaddr)
def notify_listen(self, multiaddr: Multiaddr) -> None:
for notifee in self.notifees:
self.manager.run_task(notifee.listen, self, multiaddr)
# TODO: `notify_listen_close`