From 7d6bb76f744baceee84f3eee552d3d8c6c2596b6 Mon Sep 17 00:00:00 2001 From: Jonathan Zernik Date: Fri, 22 Oct 2021 18:18:35 -0500 Subject: [PATCH] Don't delete offers for squeak on delete squeak method in controller (#1674) --- squeaknode/db/squeak_db.py | 16 ++++++++-------- squeaknode/node/squeak_controller.py | 3 --- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/squeaknode/db/squeak_db.py b/squeaknode/db/squeak_db.py index 603c9c5d..6fc4c278 100644 --- a/squeaknode/db/squeak_db.py +++ b/squeaknode/db/squeak_db.py @@ -1071,14 +1071,14 @@ class SqueakDb: deleted_offers = res.rowcount return deleted_offers - def delete_offers_for_squeak(self, squeak_hash: bytes): - """ Delete all offers for a squeak hash. """ - s = self.received_offers.delete().where( - self.received_offers.c.squeak_hash == squeak_hash) - with self.get_connection() as connection: - res = connection.execute(s) - deleted_offers = res.rowcount - return deleted_offers + # def delete_offers_for_squeak(self, squeak_hash: bytes): + # """ Delete all offers for a squeak hash. """ + # s = self.received_offers.delete().where( + # self.received_offers.c.squeak_hash == squeak_hash) + # with self.get_connection() as connection: + # res = connection.execute(s) + # deleted_offers = res.rowcount + # return deleted_offers def delete_offer(self, payment_hash: bytes): """ Delete a received offer by payment hash. """ diff --git a/squeaknode/node/squeak_controller.py b/squeaknode/node/squeak_controller.py index 5bb6970c..20a6e591 100644 --- a/squeaknode/node/squeak_controller.py +++ b/squeaknode/node/squeak_controller.py @@ -147,9 +147,6 @@ class SqueakController: return self.squeak_db.get_squeak_secret_key(squeak_hash) def delete_squeak(self, squeak_hash: bytes) -> None: - num_deleted_offers = self.squeak_db.delete_offers_for_squeak( - squeak_hash) - logger.info("Deleted number of offers : {}".format(num_deleted_offers)) self.squeak_db.delete_squeak(squeak_hash) def save_received_squeak(self, squeak: CSqueak) -> None: