qml: code style, imports

electrum/gui/qml/qebip39recovery.py

@@ -11,6 +11,7 @@ from electrum.logging import get_logger
 
 from .util import TaskThread
 
+
 class QEBip39RecoveryListModel(QAbstractListModel):
     _logger = get_logger(__name__)
 
@@ -38,8 +39,6 @@ class QEBip39RecoveryListModel(QAbstractListModel):
         self._thread = None
         self._root_seed = None
         self._state = QEBip39RecoveryListModel.State.Idle
-        # self._busy = False
-        # self._userinfo = ''
 
     def rowCount(self, index):
         return len(self._accounts)
@@ -60,10 +59,6 @@ class QEBip39RecoveryListModel(QAbstractListModel):
         self._accounts = []
         self.endResetModel()
 
-    # @pyqtProperty(str, notify=userinfoChanged)
-    # def userinfo(self):
-    #     return self._userinfo
-
     @pyqtProperty(int, notify=stateChanged)
     def state(self):
         return self._state
@@ -126,4 +121,3 @@ class QEBip39RecoveryListModel(QAbstractListModel):
         account_node = root_node.subkey_at_private_derivation(account_path)
         account_xpub = account_node.to_xpub()
         return account_xpub
-

electrum/gui/qml/qechannelopener.py

@@ -7,7 +7,7 @@ from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject
 from electrum.i18n import _
 from electrum.gui import messages
 from electrum.util import bfh
-from electrum.lnutil import extract_nodeid, LNPeerAddr, ln_dummy_address, ConnStringFormatError
+from electrum.lnutil import extract_nodeid, ln_dummy_address, ConnStringFormatError
 from electrum.lnworker import hardcoded_trampoline_nodes
 from electrum.logging import get_logger
 
@@ -219,37 +219,6 @@ class QEChannelOpener(QObject, AuthMixin):
         self.channelOpening.emit(conn_str)
         threading.Thread(target=open_thread, daemon=True).start()
 
-        # TODO: it would be nice to show this before broadcasting
-        #if chan.has_onchain_backup():
-            #self.maybe_show_funding_tx(chan, funding_tx)
-        #else:
-            #title = _('Save backup')
-            #help_text = messages.MSG_CREATED_NON_RECOVERABLE_CHANNEL
-            #data = lnworker.export_channel_backup(chan.channel_id)
-            #popup = QRDialog(
-                #title, data,
-                #show_text=False,
-                #text_for_clipboard=data,
-                #help_text=help_text,
-                #close_button_text=_('OK'),
-                #on_close=lambda: self.maybe_show_funding_tx(chan, funding_tx))
-            #popup.open()
-
-
-    #def maybe_show_funding_tx(self, chan, funding_tx):
-        #n = chan.constraints.funding_txn_minimum_depth
-        #message = '\n'.join([
-            #_('Channel established.'),
-            #_('Remote peer ID') + ':' + chan.node_id.hex(),
-            #_('This channel will be usable after {} confirmations').format(n)
-        #])
-        #if not funding_tx.is_complete():
-            #message += '\n\n' + _('Please sign and broadcast the funding transaction')
-        #self.app.show_info(message)
-
-        #if not funding_tx.is_complete():
-            #self.app.tx_dialog(funding_tx)
-
     @pyqtSlot(str, result=str)
     def channelBackup(self, cid):
         return self._wallet.wallet.lnworker.export_channel_backup(bfh(cid))

electrum/gui/qml/qeserverlistmodel.py

@@ -1,15 +1,13 @@
-from abc import abstractmethod
-
 from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject
 from PyQt5.QtCore import Qt, QAbstractListModel, QModelIndex
 
-from electrum.i18n import _
 from electrum.logging import get_logger
 from electrum.util import Satoshis, format_time
 from electrum.interface import ServerAddr, PREFERRED_NETWORK_PROTOCOL
 from electrum import blockchain
 
-from .util import QtEventListener, qt_event_listener, event_listener
+from .util import QtEventListener, qt_event_listener
+
 
 class QEServerListModel(QAbstractListModel, QtEventListener):
     _logger = get_logger(__name__)
@@ -108,7 +106,6 @@ class QEServerListModel(QAbstractListModel, QtEventListener):
                 server['address'] = i.server.to_friendly_name()
                 server['height'] = i.tip
 
-                #self._logger.debug(f'adding server: {repr(server)}')
                 servers.append(server)
 
         # disconnected servers
@@ -132,7 +129,6 @@ class QEServerListModel(QAbstractListModel, QtEventListener):
                 server['name'] = s.net_addr_str()
                 server['address'] = server['name']
 
-                # self._logger.debug(f'adding server: {repr(server)}')
                 servers.append(server)
 
         self.beginInsertRows(QModelIndex(), 0, len(servers) - 1)

electrum/gui/qml/qetxfinalizer.py

@@ -9,13 +9,13 @@ from electrum.i18n import _
 from electrum.transaction import PartialTxOutput, PartialTransaction, Transaction
 from electrum.util import NotEnoughFunds, profiler
 from electrum.wallet import CannotBumpFee, CannotDoubleSpendTx, CannotCPFP
-from electrum.network import NetworkException
 from electrum.plugin import run_hook
 
 from .qewallet import QEWallet
 from .qetypes import QEAmount
 from .util import QtEventListener, event_listener
 
+
 class FeeSlider(QObject):
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -125,6 +125,7 @@ class FeeSlider(QObject):
     def update(self):
         raise NotImplementedError()
 
+
 class TxFeeSlider(FeeSlider):
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -220,6 +221,7 @@ class TxFeeSlider(FeeSlider):
             })
         self.outputs = outputs
 
+
 class QETxFinalizer(TxFeeSlider):
     _logger = get_logger(__name__)
 
@@ -402,6 +404,7 @@ class QETxFinalizer(TxFeeSlider):
         txqr = self._tx.to_qr_data()
         return [str(self._tx), txqr[0], txqr[1]]
 
+
 # mixin for watching an existing TX based on its txid for verified event
 # requires self._wallet to contain a QEWallet instance
 # exposes txid qt property
@@ -448,6 +451,7 @@ class TxMonMixin(QtEventListener):
     def tx_verified(self):
         pass
 
+
 class QETxRbfFeeBumper(TxFeeSlider, TxMonMixin):
     _logger = get_logger(__name__)
 
@@ -578,6 +582,7 @@ class QETxRbfFeeBumper(TxFeeSlider, TxMonMixin):
     def getNewTx(self):
         return str(self._tx)
 
+
 class QETxCanceller(TxFeeSlider, TxMonMixin):
     _logger = get_logger(__name__)
 
@@ -612,7 +617,6 @@ class QETxCanceller(TxFeeSlider, TxMonMixin):
             self._oldfee_rate = oldfeerate
             self.oldfeeRateChanged.emit()
 
-
     def get_tx(self):
         assert self._txid
         self._orig_tx = self._wallet.wallet.db.get_transaction(self._txid)
@@ -674,6 +678,7 @@ class QETxCanceller(TxFeeSlider, TxMonMixin):
     def getNewTx(self):
         return str(self._tx)
 
+
 class QETxCpfpFeeBumper(TxFeeSlider, TxMonMixin):
     _logger = get_logger(__name__)
 
@@ -743,7 +748,6 @@ class QETxCpfpFeeBumper(TxFeeSlider, TxMonMixin):
     def totalSize(self):
         return self._total_size
 
-
     def get_tx(self):
         assert self._txid
         self._parent_tx = self._wallet.wallet.db.get_transaction(self._txid)
@@ -806,7 +810,6 @@ class QETxCpfpFeeBumper(TxFeeSlider, TxMonMixin):
             self.warning = _('Max fee exceeded')
             return
 
-
         comb_fee = fee + self._parent_fee
         comb_feerate = comb_fee / self._total_size