AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: veriyMasterKey don't raise Exception on unsupported wallet_type, log error and provide user feedback

Browse Source
This commit is contained in:
Sander van Grieken
2023-05-04 12:44:38 +02:00
parent 2732a82535
commit 397019fe19
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/gui/qml/qebitcoin.py
View File

@@ -107,7 +107,6 @@ class QEBitcoin(QObject):
@pyqtSlot(str, str, result=bool) @pyqtSlot(str, str, result=bool)
def verifyMasterKey(self, key, wallet_type='standard'): def verifyMasterKey(self, key, wallet_type='standard'):
# FIXME exceptions raised in here are not well-behaved...
self.validationMessage = '' self.validationMessage = ''
if not keystore.is_master_key(key): if not keystore.is_master_key(key):
self.validationMessage = _('Not a master key') self.validationMessage = _('Not a master key')
@@ -126,7 +125,10 @@ class QEBitcoin(QObject):
self.validationMessage = '%s: %s' % (_('Wrong key type'), t1) self.validationMessage = '%s: %s' % (_('Wrong key type'), t1)
return False return False
return True return True
raise Exception(f'Unsupported wallet type: {wallet_type}') else:
self.validationMessage = '%s: %s' % (_('Unsupported wallet type'), wallet_type)
self.logger.error(f'Unsupported wallet type: {wallet_type}')
return False
return True return True
@pyqtSlot(str, result=bool) @pyqtSlot(str, result=bool)