LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-28 07:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wizard: hww creation flow: don't just swallow exception

Browse source 
if we just return here, the calling code will try to create the storage and fail
This commit is contained in:
SomberNight 2020-04-09 19:04:52 +02:00
parent 4b1d835304
commit a3e1b2e00c
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
electrum/base_wizard.py
View file

@ -263,7 +263,7 @@ class BaseWizard(Logger):
k = keystore.from_master_key(text) k = keystore.from_master_key(text)
self.on_keystore(k) self.on_keystore(k)
def choose_hw_device(self, purpose=HWD_SETUP_NEW_WALLET, *, storage=None): def choose_hw_device(self, purpose=HWD_SETUP_NEW_WALLET, *, storage: WalletStorage = None):
title = _('Hardware Keystore') title = _('Hardware Keystore')
# check available plugins # check available plugins
supported_plugins = self.plugins.get_hardware_support() supported_plugins = self.plugins.get_hardware_support()
@ -343,7 +343,7 @@ class BaseWizard(Logger):
self.choice_dialog(title=title, message=msg, choices=choices, self.choice_dialog(title=title, message=msg, choices=choices,
run_next=lambda *args: self.on_device(*args, purpose=purpose, storage=storage)) run_next=lambda *args: self.on_device(*args, purpose=purpose, storage=storage))
def on_device(self, name, device_info: 'DeviceInfo', *, purpose, storage=None): def on_device(self, name, device_info: 'DeviceInfo', *, purpose, storage: WalletStorage = None):
self.plugin = self.plugins.get_plugin(name) self.plugin = self.plugins.get_plugin(name)
assert isinstance(self.plugin, HW_PluginBase) assert isinstance(self.plugin, HW_PluginBase)
devmgr = self.plugins.device_manager devmgr = self.plugins.device_manager
@ -444,6 +444,7 @@ class BaseWizard(Logger):
except BaseException as e: except BaseException as e:
self.logger.exception('') self.logger.exception('')
self.show_error(e) self.show_error(e)
self.choose_hw_device()
return return
d = { d = {
'type': 'hardware', 'type': 'hardware',
@ -565,6 +566,7 @@ class BaseWizard(Logger):
except BaseException as e: except BaseException as e:
self.logger.exception('') self.logger.exception('')
self.show_error(str(e)) self.show_error(str(e))
self.choose_hw_device()
return return
self.request_storage_encryption( self.request_storage_encryption(
run_next=lambda encrypt_storage: self.on_password( run_next=lambda encrypt_storage: self.on_password(