From bf067f7558657edd31b2dd7e6b30f0243cda528a Mon Sep 17 00:00:00 2001 From: SomberNight Date: Wed, 8 Apr 2020 18:28:21 +0200 Subject: [PATCH] HardwareClientBase: provide default implementation for label and add warning about placeholders --- electrum/plugins/digitalbitbox/digitalbitbox.py | 4 ---- electrum/plugins/hw_wallet/plugin.py | 4 +++- electrum/plugins/ledger/ledger.py | 3 --- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/electrum/plugins/digitalbitbox/digitalbitbox.py b/electrum/plugins/digitalbitbox/digitalbitbox.py index 463a2f954..b0986dc1e 100644 --- a/electrum/plugins/digitalbitbox/digitalbitbox.py +++ b/electrum/plugins/digitalbitbox/digitalbitbox.py @@ -88,10 +88,6 @@ class DigitalBitbox_Client(HardwareClientBase): pass - def label(self): - return " " - - def is_pairable(self): return True diff --git a/electrum/plugins/hw_wallet/plugin.py b/electrum/plugins/hw_wallet/plugin.py index 2fb7876ed..661fdbc10 100644 --- a/electrum/plugins/hw_wallet/plugin.py +++ b/electrum/plugins/hw_wallet/plugin.py @@ -196,7 +196,9 @@ class HardwareClientBase: and they are also used as a fallback to distinguish devices programmatically. So ideally, different devices would have different labels. """ - raise NotImplementedError() + # When returning a constant here (i.e. not implementing the method in the way + # it is supposed to work), make sure the return value is in electrum.plugin.PLACEHOLDER_HW_CLIENT_LABELS + return " " def get_soft_device_id(self) -> Optional[str]: """An id-like string that is used to distinguish devices programmatically. diff --git a/electrum/plugins/ledger/ledger.py b/electrum/plugins/ledger/ledger.py index 54bf0a023..5b9047c27 100644 --- a/electrum/plugins/ledger/ledger.py +++ b/electrum/plugins/ledger/ledger.py @@ -80,9 +80,6 @@ class Ledger_Client(HardwareClientBase): def is_initialized(self): return True - def label(self): - return "" - def get_soft_device_id(self): if self._soft_device_id is None: # modern ledger can provide xpub without user interaction