AaronFiore/electrum
1
0
Fork 0
Code Activity

Don't use is_available() for HW wallets

Browse Source 
is_available() is only used from generic code for non-hardware
wallets.  Having a local function of the same name is confusing.
This commit is contained in:
Neil Booth
2015-12-29 22:46:22 +09:00
parent 1f3ddad0cd
commit 56497c1ae2
2 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/ledger/ledger.py
View File

@@ -421,30 +421,21 @@ class LedgerPlugin(BasePlugin):
def __init__(self, parent, config, name): def __init__(self, parent, config, name):
BasePlugin.__init__(self, parent, config, name) BasePlugin.__init__(self, parent, config, name)
self._is_available = self._init()
self.wallet = None self.wallet = None
self.handler = None self.handler = None
def constructor(self, s): def constructor(self, s):
return BTChipWallet(s) return BTChipWallet(s)
def _init(self):
return BTCHIP
def is_available(self):
if not self._is_available:
return False
if not self.wallet:
return False
if self.wallet.storage.get('wallet_type') != 'btchip':
return False
return True
def set_enabled(self, enabled): def set_enabled(self, enabled):
self.wallet.storage.put('use_' + self.name, enabled) self.wallet.storage.put('use_' + self.name, enabled)
def is_enabled(self): def is_enabled(self):
if not self.is_available(): if not BTCHIP:
return False
if not self.wallet:
return False
if self.wallet.storage.get('wallet_type') != 'btchip':
return False return False
if self.wallet.has_seed(): if self.wallet.has_seed():
return False return False

15
plugins/trezor/plugin.py
View File

@@ -165,19 +165,16 @@ class TrezorCompatiblePlugin(BasePlugin):
self.print_error(message) self.print_error(message)
raise Exception(message) raise Exception(message)
def is_available(self):
if not self.libraries_available:
return False
if not self.wallet:
return False
wallet_type = self.wallet.storage.get('wallet_type')
return wallet_type == self.wallet_class.wallet_type
def set_enabled(self, enabled): def set_enabled(self, enabled):
self.wallet.storage.put('use_' + self.name, enabled) self.wallet.storage.put('use_' + self.name, enabled)
def is_enabled(self): def is_enabled(self):
if not self.is_available(): if not self.libraries_available:
return False
if not self.wallet:
return False
wallet_type = self.wallet_class.wallet_type
if self.wallet.storage.get('wallet_type') != wallet_type:
return False return False
if self.wallet.has_seed(): if self.wallet.has_seed():
return False return False