Browse Source

network: rename network.tor_proxy to network.is_proxy_tor and keep it at None until TOR probe is done.

master
Sander van Grieken 2 years ago
parent
commit
0d476f73df
No known key found for this signature in database
GPG Key ID: 9BCF8209EA402EBA
  1. 2
      electrum/gui/qml/qenetwork.py
  2. 2
      electrum/gui/qt/main_window.py
  3. 2
      electrum/gui/qt/network_dialog.py
  4. 6
      electrum/network.py

2
electrum/gui/qml/qenetwork.py

@ -267,7 +267,7 @@ class QENetwork(QObject, QtEventListener):
proxyTorChanged = pyqtSignal()
@pyqtProperty(bool, notify=proxyTorChanged)
def isProxyTor(self):
return self.network.tor_proxy
return bool(self.network.is_proxy_tor)
@pyqtProperty('QVariant', notify=feeHistogramUpdated)
def feeHistogram(self):

2
electrum/gui/qt/main_window.py

@ -965,7 +965,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
balance_text = ""
if self.tor_button:
self.tor_button.setVisible(self.network and self.network.tor_proxy)
self.tor_button.setVisible(self.network and bool(self.network.is_proxy_tor))
if self.network is None:
network_text = _("Offline")

2
electrum/gui/qt/network_dialog.py

@ -146,7 +146,7 @@ class NodesListWidget(QTreeWidget):
def update(self, *, network: Network, servers: dict):
self.clear()
use_tor = network.tor_proxy
use_tor = bool(network.is_proxy_tor)
# connected servers
connected_servers_item = QTreeWidgetItem([_("Connected nodes"), ''])

6
electrum/network.py

@ -324,7 +324,7 @@ class Network(Logger, NetworkRetryManager[ServerAddr]):
self._allowed_protocols = {PREFERRED_NETWORK_PROTOCOL}
self.proxy = None
self.tor_proxy = False
self.is_proxy_tor = None
self._init_parameters_from_config()
self.taskgroup = None
@ -633,7 +633,7 @@ class Network(Logger, NetworkRetryManager[ServerAddr]):
self.logger.info(f'setting proxy {proxy}')
self.proxy = proxy
self.tor_proxy = False
self.is_proxy_tor = False
def tor_probe_task(p):
assert p is not None
@ -649,7 +649,7 @@ class Network(Logger, NetworkRetryManager[ServerAddr]):
util.trigger_callback('proxy_set', self.proxy)
def _tor_probe_done(self, is_tor: bool):
self.tor_proxy = is_tor
self.is_proxy_tor = is_tor
util.trigger_callback('tor_probed', is_tor)
@log_exceptions

Loading…
Cancel
Save