GlcoinCore/squeaknode
1
0
Fork 0
mirror of https://github.com/yzernik/squeaknode.git synced 2026-08-19 13:18:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix get connected peer rpc when disconnected (#1369)

Browse source
This commit is contained in:
Jonathan Zernik 2021-09-20 16:04:01 -07:00 • committed by GitHub
parent 4f0d30e08c
commit 5ec3f2482e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
squeaknode/node/squeak_controller.py
View file

@ -629,8 +629,10 @@ class SqueakController:
peer.address,
)
def get_connected_peer(self, peer_address: PeerAddress) -> ConnectedPeer:
def get_connected_peer(self, peer_address: PeerAddress) -> Optional[ConnectedPeer]:
peer = self.network_manager.get_connected_peer(peer_address)
if peer is None:
return None
return ConnectedPeer(
peer=peer,
saved_peer=self.squeak_db.get_peer_by_address(
@ -801,14 +803,17 @@ class SqueakController:
) for peer in peers
]
def subscribe_connected_peer(self, peer_address: PeerAddress, stopped: threading.Event) -> Iterable[ConnectedPeer]:
def subscribe_connected_peer(self, peer_address: PeerAddress, stopped: threading.Event) -> Iterable[Optional[ConnectedPeer]]:
for peer in self.network_manager.subscribe_connected_peer(peer_address, stopped):
yield ConnectedPeer(
peer=peer,
saved_peer=self.squeak_db.get_peer_by_address(
peer.remote_address,
),
)
if peer is None:
yield None
else:
yield ConnectedPeer(
peer=peer,
saved_peer=self.squeak_db.get_peer_by_address(
peer.remote_address,
),
)
def subscribe_new_squeaks(self, stopped: threading.Event):
yield from self.new_squeak_listener.yield_items(stopped)