thw wallets: test client is not None during setup_device - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit e523b657675ffeb2013de898acb7524a0537fefe
DIR parent 811eea0b6bfd1429396eee3b36ce680b3c1e2df2
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Sun, 6 May 2018 14:45:03 +0200
hw wallets: test client is not None during setup_device
Diffstat:
M plugins/digitalbitbox/digitalbitbo… | 3 +++
M plugins/keepkey/keepkey.py | 3 +++
M plugins/ledger/ledger.py | 3 +++
M plugins/trezor/trezor.py | 3 +++
4 files changed, 12 insertions(+), 0 deletions(-)
---
DIR diff --git a/plugins/digitalbitbox/digitalbitbox.py b/plugins/digitalbitbox/digitalbitbox.py
t@@ -695,6 +695,9 @@ class DigitalBitboxPlugin(HW_PluginBase):
devmgr = self.device_manager()
device_id = device_info.device.id_
client = devmgr.client_by_id(device_id)
+ if client is None:
+ raise Exception(_('Failed to create a client for this device.') + '\n' +
+ _('Make sure it is in the correct state.'))
client.handler = self.create_handler(wizard)
if purpose == HWD_SETUP_NEW_WALLET:
client.setupRunning = True
DIR diff --git a/plugins/keepkey/keepkey.py b/plugins/keepkey/keepkey.py
t@@ -224,6 +224,9 @@ class KeepKeyPlugin(HW_PluginBase):
devmgr = self.device_manager()
device_id = device_info.device.id_
client = devmgr.client_by_id(device_id)
+ if client is None:
+ raise Exception(_('Failed to create a client for this device.') + '\n' +
+ _('Make sure it is in the correct state.'))
# fixme: we should use: client.handler = wizard
client.handler = self.create_handler(wizard)
if not device_info.initialized:
DIR diff --git a/plugins/ledger/ledger.py b/plugins/ledger/ledger.py
t@@ -585,6 +585,9 @@ class LedgerPlugin(HW_PluginBase):
devmgr = self.device_manager()
device_id = device_info.device.id_
client = devmgr.client_by_id(device_id)
+ if client is None:
+ raise Exception(_('Failed to create a client for this device.') + '\n' +
+ _('Make sure it is in the correct state.'))
client.handler = self.create_handler(wizard)
client.get_xpub("m/44'/0'", 'standard') # TODO replace by direct derivation once Nano S > 1.1
DIR diff --git a/plugins/trezor/trezor.py b/plugins/trezor/trezor.py
t@@ -257,6 +257,9 @@ class TrezorPlugin(HW_PluginBase):
devmgr = self.device_manager()
device_id = device_info.device.id_
client = devmgr.client_by_id(device_id)
+ if client is None:
+ raise Exception(_('Failed to create a client for this device.') + '\n' +
+ _('Make sure it is in the correct state.'))
# fixme: we should use: client.handler = wizard
client.handler = self.create_handler(wizard)
if not device_info.initialized: