config: follow-up rename of FEE_EST_STATIC_FEERATE

follow-up 455167136d

electrum/gui/qml/qetxfinalizer.py

@@ -1,5 +1,5 @@
 from decimal import Decimal
-from typing import Optional
+from typing import Optional, TYPE_CHECKING
 from functools import partial
 
 from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject
@@ -15,17 +15,20 @@ from .qewallet import QEWallet
 from .qetypes import QEAmount
 from .util import QtEventListener, event_listener
 
+if TYPE_CHECKING:
+    from electrum.simple_config import SimpleConfig
+
 
 class FeeSlider(QObject):
     def __init__(self, parent=None):
         super().__init__(parent)
 
-        self._wallet = None
+        self._wallet = None  # type: Optional[QEWallet]
         self._sliderSteps = 0
         self._sliderPos = 0
         self._method = -1
         self._target = ''
-        self._config = None
+        self._config = None  # type: Optional[SimpleConfig]
 
     walletChanged = pyqtSignal()
     @pyqtProperty(QEWallet, notify=walletChanged)
@@ -118,7 +121,7 @@ class FeeSlider(QObject):
             else:
                 self._config.FEE_EST_DYNAMIC_ETA_SLIDERPOS = value
         else:
-            self._config.FEE_EST_STATIC_FEERATE_FALLBACK = self._config.static_fee(value)
+            self._config.FEE_EST_STATIC_FEERATE = self._config.static_fee(value)
         self.update_target()
         self.update()
 

electrum/gui/qt/confirm_tx_dialog.py

@@ -134,7 +134,7 @@ class TxEditor(WindowModalDialog):
             else:
                 self.config.cv.FEE_EST_DYNAMIC_ETA_SLIDERPOS.set(pos, save=False)
         else:
-            self.config.cv.FEE_EST_STATIC_FEERATE_FALLBACK.set(fee_rate, save=False)
+            self.config.cv.FEE_EST_STATIC_FEERATE.set(fee_rate, save=False)
 
     def update_tx(self, *, fallback_to_zero_fee: bool = False):
         # expected to set self.tx, self.message and self.error

electrum/gui/qt/swap_dialog.py

@@ -141,7 +141,7 @@ class SwapDialog(WindowModalDialog, QtEventListener):
             else:
                 self.config.cv.FEE_EST_DYNAMIC_ETA_SLIDERPOS.set(pos, save=False)
         else:
-            self.config.cv.FEE_EST_STATIC_FEERATE_FALLBACK.set(fee_rate, save=False)
+            self.config.cv.FEE_EST_STATIC_FEERATE.set(fee_rate, save=False)
         if self.send_follows:
             self.on_recv_edited()
         else:

electrum/gui/text.py

@@ -749,7 +749,7 @@ class ElectrumGui(BaseElectrumGui, EventListener):
         if out:
             if out.get('Default fee'):
                 fee = int(Decimal(out['Default fee']) * COIN)
-                self.config.FEE_EST_STATIC_FEERATE_FALLBACK = fee
+                self.config.FEE_EST_STATIC_FEERATE = fee
 
     def password_dialog(self):
         out = self.run_dialog('Password', [

electrum/simple_config.py

@@ -749,7 +749,7 @@ class SimpleConfig(Logger):
             fee_rate = int(fee_rate)
         return fee_rate
 
-    def getfeerate(self) -> Tuple[str, int, int]:
+    def getfeerate(self) -> Tuple[str, int, Optional[int], str]:
         dyn = self.is_dynfee()
         mempool = self.use_mempool_fees()
         if dyn: