AaronFiore/electrum
1
0
Fork 0
Code Activity

rm dead code: first branch of the if never evaluated because WalletDB is called with manual_upgrades=False

Browse Source
This commit is contained in:
ThomasV
2020-12-01 10:25:47 +01:00
parent 4640bf7fcb
commit f187587430
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
electrum/gui/kivy/main_window.py
View File

@@ -643,17 +643,6 @@ class ElectrumWindow(App, Logger):
self.load_wallet_by_name(self.electrum_config.get_wallet_path(use_gui_last_wallet=True), self.load_wallet_by_name(self.electrum_config.get_wallet_path(use_gui_last_wallet=True),
ask_if_wizard=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): def load_wallet_by_name(self, path, ask_if_wizard=False):
if not path: if not path:
return return
@@ -685,7 +674,9 @@ class ElectrumWindow(App, Logger):
else: else:
assert storage.is_past_initial_decryption() assert storage.is_past_initial_decryption()
self.password = pw 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): def on_stop(self):
self.logger.info('on_stop') self.logger.info('on_stop')