Browse Source

hw plugins: (cleanup) rm no-op clear_client argument from keystore.give_error

The keystore does not have a "client" field.
One is supposed to use the "get_client" method instead (the generic API is `plugin.get_client(keystore)`)
Remnants of old code.
master
SomberNight 4 years ago
parent
commit
6c50d3b0a3
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
  1. 6
      electrum/plugins/bitbox02/bitbox02.py
  2. 8
      electrum/plugins/coldcard/coldcard.py
  3. 6
      electrum/plugins/digitalbitbox/digitalbitbox.py
  4. 16
      electrum/plugins/ledger/ledger.py

6
electrum/plugins/bitbox02/bitbox02.py

@ -564,14 +564,12 @@ class BitBox02_KeyStore(Hardware_KeyStore):
def get_client(self) -> Optional['BitBox02Client']: def get_client(self) -> Optional['BitBox02Client']:
return self.plugin.get_client(self) return self.plugin.get_client(self)
def give_error(self, message: Exception, clear_client: bool = False): def give_error(self, message: Exception):
self.logger.info(message) self.logger.info(message)
if not self.ux_busy: if not self.ux_busy:
self.handler.show_error(message) self.handler.show_error(message)
else: else:
self.ux_busy = False self.ux_busy = False
if clear_client:
self.client = None
raise UserFacingException(message) raise UserFacingException(message)
def decrypt_message(self, pubkey, message, password): def decrypt_message(self, pubkey, message, password):
@ -606,7 +604,7 @@ class BitBox02_KeyStore(Hardware_KeyStore):
except Exception as e: except Exception as e:
self.logger.exception("") self.logger.exception("")
self.give_error(e, True) self.give_error(e)
return return
@runs_in_hwd_thread @runs_in_hwd_thread

8
electrum/plugins/coldcard/coldcard.py

@ -280,14 +280,12 @@ class Coldcard_KeyStore(Hardware_KeyStore):
return rv return rv
def give_error(self, message, clear_client=False): def give_error(self, message):
self.logger.info(message) self.logger.info(message)
if not self.ux_busy: if not self.ux_busy:
self.handler.show_error(message) self.handler.show_error(message)
else: else:
self.ux_busy = False self.ux_busy = False
if clear_client:
self.client = None
raise UserFacingException(message) raise UserFacingException(message)
def wrap_busy(func): def wrap_busy(func):
@ -351,7 +349,7 @@ class Coldcard_KeyStore(Hardware_KeyStore):
self.handler.show_error('{}\n\n{}'.format( self.handler.show_error('{}\n\n{}'.format(
_('Error showing address') + ':', str(exc))) _('Error showing address') + ':', str(exc)))
except Exception as e: except Exception as e:
self.give_error(e, True) self.give_error(e)
# give empty bytes for error cases; it seems to clear the old signature box # give empty bytes for error cases; it seems to clear the old signature box
return b'' return b''
@ -397,7 +395,7 @@ class Coldcard_KeyStore(Hardware_KeyStore):
return return
except BaseException as e: except BaseException as e:
self.logger.exception('') self.logger.exception('')
self.give_error(e, True) self.give_error(e)
return return
tx2 = PartialTransaction.from_raw_psbt(raw_resp) tx2 = PartialTransaction.from_raw_psbt(raw_resp)

6
electrum/plugins/digitalbitbox/digitalbitbox.py

@ -444,9 +444,7 @@ class DigitalBitbox_KeyStore(Hardware_KeyStore):
Hardware_KeyStore.__init__(self, d) Hardware_KeyStore.__init__(self, d)
self.maxInputs = 14 # maximum inputs per single sign command self.maxInputs = 14 # maximum inputs per single sign command
def give_error(self, message, clear_client = False): def give_error(self, message):
if clear_client:
self.client = None
raise Exception(message) raise Exception(message)
@ -652,7 +650,7 @@ class DigitalBitbox_KeyStore(Hardware_KeyStore):
except UserCancelled: except UserCancelled:
raise raise
except BaseException as e: except BaseException as e:
self.give_error(e, True) self.give_error(e)
else: else:
_logger.info(f"Transaction is_complete {tx.is_complete()}") _logger.info(f"Transaction is_complete {tx.is_complete()}")

16
electrum/plugins/ledger/ledger.py

@ -260,14 +260,12 @@ class Ledger_KeyStore(Hardware_KeyStore):
def get_client_electrum(self) -> Optional[Ledger_Client]: def get_client_electrum(self) -> Optional[Ledger_Client]:
return self.plugin.get_client(self) return self.plugin.get_client(self)
def give_error(self, message, clear_client = False): def give_error(self, message):
_logger.info(message) _logger.info(message)
if not self.signing: if not self.signing:
self.handler.show_error(message) self.handler.show_error(message)
else: else:
self.signing = False self.signing = False
if clear_client:
self.client = None
raise UserFacingException(message) raise UserFacingException(message)
def set_and_unset_signing(func): def set_and_unset_signing(func):
@ -306,18 +304,20 @@ class Ledger_KeyStore(Hardware_KeyStore):
signature = client_ledger.signMessageSign(pin) signature = client_ledger.signMessageSign(pin)
except BTChipException as e: except BTChipException as e:
if e.sw == 0x6a80: if e.sw == 0x6a80:
self.give_error("Unfortunately, this message cannot be signed by the Ledger wallet. Only alphanumerical messages shorter than 140 characters are supported. Please remove any extra characters (tab, carriage return) and retry.") self.give_error("Unfortunately, this message cannot be signed by the Ledger wallet. "
"Only alphanumerical messages shorter than 140 characters are supported. "
"Please remove any extra characters (tab, carriage return) and retry.")
elif e.sw == 0x6985: # cancelled by user elif e.sw == 0x6985: # cancelled by user
return b'' return b''
elif e.sw == 0x6982: elif e.sw == 0x6982:
raise # pin lock. decorator will catch it raise # pin lock. decorator will catch it
else: else:
self.give_error(e, True) self.give_error(e)
except UserWarning: except UserWarning:
self.handler.show_error(_('Cancelled by user')) self.handler.show_error(_('Cancelled by user'))
return b'' return b''
except Exception as e: except Exception as e:
self.give_error(e, True) self.give_error(e)
finally: finally:
self.handler.finished() self.handler.finished()
# Parse the ASN.1 signature # Parse the ASN.1 signature
@ -541,10 +541,10 @@ class Ledger_KeyStore(Hardware_KeyStore):
raise # pin lock. decorator will catch it raise # pin lock. decorator will catch it
else: else:
self.logger.exception('') self.logger.exception('')
self.give_error(e, True) self.give_error(e)
except BaseException as e: except BaseException as e:
self.logger.exception('') self.logger.exception('')
self.give_error(e, True) self.give_error(e)
finally: finally:
self.handler.finished() self.handler.finished()

Loading…
Cancel
Save