From d68e6a69c1c7cb9614bf798d7416c50ead7857e5 Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Wed, 6 Sep 2023 12:10:46 +0200 Subject: [PATCH] qt: wizardcomponents all use Logger mixin. Fix missing self.plugins init in WCTrezorInitMethod --- electrum/gui/qt/wizard/wallet.py | 27 +++++++++++++-------------- electrum/plugins/trezor/qt.py | 1 + 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/electrum/gui/qt/wizard/wallet.py b/electrum/gui/qt/wizard/wallet.py index 549636a7f..85a9d7547 100644 --- a/electrum/gui/qt/wizard/wallet.py +++ b/electrum/gui/qt/wizard/wallet.py @@ -221,9 +221,10 @@ class QENewWalletWizard(NewWalletWizard, QEAbstractWizard, MessageBoxMixin): on_finished() -class WCWalletName(WizardComponent): +class WCWalletName(WizardComponent, Logger): def __init__(self, parent, wizard): WizardComponent.__init__(self, parent, wizard, title=_('Electrum wallet')) + Logger.__init__(self) path = wizard._path @@ -459,11 +460,10 @@ class WCConfirmSeed(WizardComponent): pass -class WCEnterExt(WizardComponent): - _logger = get_logger(__name__) - +class WCEnterExt(WizardComponent, Logger): def __init__(self, parent, wizard): WizardComponent.__init__(self, parent, wizard, title=_('Seed Extension')) + Logger.__init__(self) message = '\n'.join([ _('You may extend your seed with custom words.'), @@ -500,11 +500,11 @@ class WCEnterExt(WizardComponent): self.valid = True else: if self.wizard.has_duplicate_masterkeys(self.wizard_data): - self._logger.debug('Duplicate master keys!') + self.logger.debug('Duplicate master keys!') # TODO: user feedback self.valid = False elif self.wizard.has_heterogeneous_masterkeys(self.wizard_data): - self._logger.debug('Heterogenous master keys!') + self.logger.debug('Heterogenous master keys!') # TODO: user feedback self.valid = False else: @@ -536,11 +536,11 @@ class WCConfirmExt(WizardComponent): pass -class WCHaveSeed(WizardComponent): - _logger = get_logger(__name__) - +class WCHaveSeed(WizardComponent, Logger): def __init__(self, parent, wizard): WizardComponent.__init__(self, parent, wizard, title=_('Enter Seed')) + Logger.__init__(self) + self.layout().addWidget(WWLabel(_('Please enter your seed phrase in order to restore your wallet.'))) # TODO: SeedLayout assumes too much in parent, refactor SeedLayout @@ -594,11 +594,11 @@ class WCHaveSeed(WizardComponent): else: self.apply() if self.wizard.has_duplicate_masterkeys(self.wizard_data): - self._logger.debug('Duplicate master keys!') + self.logger.debug('Duplicate master keys!') # TODO: user feedback seed_valid = False elif self.wizard.has_heterogeneous_masterkeys(self.wizard_data): - self._logger.debug('Heterogenous master keys!') + self.logger.debug('Heterogenous master keys!') # TODO: user feedback seed_valid = False @@ -617,11 +617,10 @@ class WCHaveSeed(WizardComponent): cosigner_data['seed_extra_words'] = '' # empty default -class WCScriptAndDerivation(WizardComponent): - _logger = get_logger(__name__) - +class WCScriptAndDerivation(WizardComponent, Logger): def __init__(self, parent, wizard): WizardComponent.__init__(self, parent, wizard, title=_('Script type and Derivation path')) + Logger.__init__(self) def on_ready(self): message1 = _('Choose the type of addresses in your wallet.') diff --git a/electrum/plugins/trezor/qt.py b/electrum/plugins/trezor/qt.py index 1285f5de9..b4e9cfaa8 100644 --- a/electrum/plugins/trezor/qt.py +++ b/electrum/plugins/trezor/qt.py @@ -815,6 +815,7 @@ class WCTrezorInitMethod(WizardComponent, Logger): def __init__(self, parent, wizard): WizardComponent.__init__(self, parent, wizard, title=_('HW Setup')) Logger.__init__(self) + self.plugins = wizard.plugins self.plugin = None def on_ready(self):