trm dead code: first branch of the if never evaluated because WalletDB is called with manual_upgrades=False - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit f1875874309051de1f604c7b7b0e2e2a0fe5881c
DIR parent 4640bf7fcbf70a9359b8ec67ca5ca06748571a91
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 1 Dec 2020 10:25:47 +0100
rm dead code: first branch of the if never evaluated because WalletDB is called with manual_upgrades=False
Diffstat:
M electrum/gui/kivy/main_window.py | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
---
DIR diff --git a/electrum/gui/kivy/main_window.py b/electrum/gui/kivy/main_window.py
t@@ -643,17 +643,6 @@ class ElectrumWindow(App, Logger):
self.load_wallet_by_name(self.electrum_config.get_wallet_path(use_gui_last_wallet=True),
ask_if_wizard=True)
- def _on_decrypted_storage(self, storage: WalletStorage):
- assert storage.is_past_initial_decryption()
- db = WalletDB(storage.read(), manual_upgrades=False)
- if db.requires_upgrade():
- wizard = Factory.InstallWizard(self.electrum_config, self.plugins)
- wizard.path = storage.path
- wizard.bind(on_wizard_complete=self.on_wizard_complete)
- wizard.upgrade_storage(storage, db)
- else:
- self.on_wizard_complete(None, storage, db)
-
def load_wallet_by_name(self, path, ask_if_wizard=False):
if not path:
return
t@@ -685,7 +674,9 @@ class ElectrumWindow(App, Logger):
else:
assert storage.is_past_initial_decryption()
self.password = pw
- self._on_decrypted_storage(storage)
+ db = WalletDB(storage.read(), manual_upgrades=False)
+ assert not db.requires_upgrade()
+ self.on_wizard_complete(None, storage, db)
def on_stop(self):
self.logger.info('on_stop')