From b3ab269fd4c7994f6e32a1c32926912edf0d8404 Mon Sep 17 00:00:00 2001 From: Daniel Gonzalez Gasull Date: Fri, 26 Mar 2021 05:15:39 +0000 Subject: [PATCH] Refactor dead code into reachable but disabled Refactors `request_fee_estimates` with new `is_disabled=True` argument, so code is now reachable but never executed. Also refactored `except` so it it shows the error instead of just declaring an string that isn't assigned or used. --- electroncash/network.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/electroncash/network.py b/electroncash/network.py index 062c43144a80..765a9d3acd98 100644 --- a/electroncash/network.py +++ b/electroncash/network.py @@ -518,17 +518,18 @@ def send_subscriptions(self): n_defunct += 1 self.print_error('sent subscriptions to', self.interface.server, len(old_reqs),"reqs", len(self.subscribed_addresses), "subs", n_defunct, "defunct subs") - def request_fee_estimates(self): - self.print_error("request_fee_estimates called: DISABLED in network.py") - return - # We disable fee estimates. BCH doesn't need this code. For now 1 sat/B - # is enough. + def request_fee_estimates(self, is_disabled=True): + """ We disable fee estimates. BCH doesn't need this code. + For now 1 sat/B is enough. """ + if is_disabled: + self.print_error("request_fee_estimates called: DISABLED in network.py") + return self.config.requested_fee_estimates() try: for i in bitcoin.FEE_TARGETS: self.queue_request('blockchain.estimatefee', [i]) except AssertionError: - '''No interface available.''' + self.print_error("No interface available.") def get_status_value(self, key): if key == 'status':