From dec871876e2ec874800a76b1426f266f81a461ff Mon Sep 17 00:00:00 2001 From: Jonathan Zernik Date: Mon, 30 Aug 2021 20:23:12 -0700 Subject: [PATCH] Use yield from where possible (#1120) --- squeaknode/network/connection_manager.py | 3 +-- squeaknode/network/network_manager.py | 12 +++++------- squeaknode/node/squeak_controller.py | 6 ++---- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/squeaknode/network/connection_manager.py b/squeaknode/network/connection_manager.py index 9477712b..aa42f053 100644 --- a/squeaknode/network/connection_manager.py +++ b/squeaknode/network/connection_manager.py @@ -118,8 +118,7 @@ class ConnectionManager(object): peer.stop() def yield_peers_changed(self, stopped: threading.Event): - for item in self.peer_changed_listener.yield_items(stopped): - yield item + yield from self.peer_changed_listener.yield_items(stopped) def yield_single_peer_changed(self, peer_address: PeerAddress, stopped: threading.Event): for peer in self.single_peer_changed_listener.yield_items(stopped): diff --git a/squeaknode/network/network_manager.py b/squeaknode/network/network_manager.py index fdfde195..e0ebc26b 100644 --- a/squeaknode/network/network_manager.py +++ b/squeaknode/network/network_manager.py @@ -137,12 +137,10 @@ class NetworkManager(object): ) def subscribe_connected_peers(self, stopped): - for result in self.connection_manager.yield_peers_changed(stopped): - yield result + yield from self.connection_manager.yield_peers_changed(stopped) def subscribe_connected_peer(self, peer_address: PeerAddress, stopped): - for result in self.connection_manager.yield_single_peer_changed( - peer_address, - stopped, - ): - yield result + yield from self.connection_manager.yield_single_peer_changed( + peer_address, + stopped, + ) diff --git a/squeaknode/node/squeak_controller.py b/squeaknode/node/squeak_controller.py index 5498eef9..c8dbada3 100644 --- a/squeaknode/node/squeak_controller.py +++ b/squeaknode/node/squeak_controller.py @@ -407,8 +407,7 @@ class SqueakController: initial_index, stopped, ).open_subscription() as client: - for payment in client.get_received_payments(): - yield payment + yield from client.get_received_payments() def get_block_range(self) -> BlockRange: max_block = self.squeak_core.get_best_block_height() @@ -674,8 +673,7 @@ class SqueakController: return self.network_manager.subscribe_connected_peer(peer_address, stopped) def subscribe_new_squeaks(self, stopped: threading.Event): - for item in self.new_squeak_listener.yield_items(stopped): - yield item + yield from self.new_squeak_listener.yield_items(stopped) def update_subscriptions(self): locator = self.get_interested_locator()