From c59559c1be3446a3af6c5fce7f9da0f4e0716e4b Mon Sep 17 00:00:00 2001 From: Jonathan Zernik Date: Fri, 3 Sep 2021 09:23:41 -0700 Subject: [PATCH] Remove todo for loading missing offers (#1166) * Remove todo comment for loading missing offers * Simplfy handle inv peer message * Remove depracated todo from handle peer squeak msg * Delete old comment for filter known invs method --- squeaknode/network/peer_message_handler.py | 6 ++++-- squeaknode/node/squeak_controller.py | 18 ------------------ 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/squeaknode/network/peer_message_handler.py b/squeaknode/network/peer_message_handler.py index 96d99e4f..b4aab749 100644 --- a/squeaknode/network/peer_message_handler.py +++ b/squeaknode/network/peer_message_handler.py @@ -123,7 +123,10 @@ class PeerMessageHandler: def handle_inv(self, msg): invs = msg.inv - unknown_invs = self.squeak_controller.filter_known_invs(invs) + unknown_invs = [ + inv for inv in invs + if inv.type == 1 and self.squeak_controller.get_squeak(inv.hash) is None + ] if unknown_invs: getdata_msg = msg_getdata(inv=unknown_invs) self.peer.send_msg(getdata_msg) @@ -149,7 +152,6 @@ class PeerMessageHandler: def handle_squeak(self, msg): squeak = msg.squeak - # TODO: check if interested before saving. self.squeak_controller.save_received_squeak(squeak) def handle_offer(self, msg): diff --git a/squeaknode/node/squeak_controller.py b/squeaknode/node/squeak_controller.py index a6099ba7..0e4647cb 100644 --- a/squeaknode/node/squeak_controller.py +++ b/squeaknode/node/squeak_controller.py @@ -557,24 +557,6 @@ class SqueakController: reply_to_hash, ) - def filter_known_invs(self, invs): - ret = [] - for inv in invs: - if inv.type == 1: - squeak_entry = self.squeak_db.get_squeak_entry( - inv.hash, - ) - if squeak_entry is None: - ret.append( - CInv(type=1, hash=inv.hash) - ) - # TODO: Decide if offers should be loaded whenever missing? - # elif not squeak_entry.squeak.HasDecryptionKey(): - # ret.append( - # CInv(type=2, hash=inv.hash) - # ) - return ret - def get_interested_locator(self): block_range = self.get_block_range() followed_addresses = self.get_followed_addresses()