AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: qenetwork events don't need to be handled in qt thread

Browse Source 
don't retrieve fee histogram from backend as it's passed in the event
This commit is contained in:
Sander van Grieken
2022-07-21 13:24:32 +02:00
parent e7554ba225
commit ccd182ec18
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
electrum/gui/qml/qenetwork.py
View File

@@ -4,7 +4,7 @@ from electrum.logging import get_logger
from electrum import constants from electrum import constants
from electrum.interface import ServerAddr from electrum.interface import ServerAddr
from .util import QtEventListener, qt_event_listener from .util import QtEventListener, event_listener
class QENetwork(QObject, QtEventListener): class QENetwork(QObject, QtEventListener):
def __init__(self, network, parent=None): def __init__(self, network, parent=None):
@@ -28,12 +28,13 @@ class QENetwork(QObject, QtEventListener):
_height = 0 _height = 0
_status = "" _status = ""
_fee_histogram = []
@qt_event_listener @event_listener
def on_event_network_updated(self, *args): def on_event_network_updated(self, *args):
self.networkUpdated.emit() self.networkUpdated.emit()
@qt_event_listener @event_listener
def on_event_blockchain_updated(self, *args): def on_event_blockchain_updated(self, *args):
if self._height != self.network.get_local_height(): if self._height != self.network.get_local_height():
self._height = self.network.get_local_height() self._height = self.network.get_local_height()
@@ -41,25 +42,26 @@ class QENetwork(QObject, QtEventListener):
self.heightChanged.emit(self._height) self.heightChanged.emit(self._height)
self.blockchainUpdated.emit() self.blockchainUpdated.emit()
@qt_event_listener @event_listener
def on_event_default_server_changed(self, *args): def on_event_default_server_changed(self, *args):
self.defaultServerChanged.emit() self.defaultServerChanged.emit()
@qt_event_listener @event_listener
def on_event_proxy_set(self, *args): def on_event_proxy_set(self, *args):
self._logger.debug('proxy set') self._logger.debug('proxy set')
self.proxySet.emit() self.proxySet.emit()
@qt_event_listener @event_listener
def on_event_status(self, *args): def on_event_status(self, *args):
self._logger.debug('status updated: %s' % self.network.connection_status) self._logger.debug('status updated: %s' % self.network.connection_status)
if self._status != self.network.connection_status: if self._status != self.network.connection_status:
self._status = self.network.connection_status self._status = self.network.connection_status
self.statusChanged.emit() self.statusChanged.emit()
@qt_event_listener @event_listener
def on_event_fee_histogram(self, *args): def on_event_fee_histogram(self, histogram):
self._logger.debug('fee histogram updated') self._logger.debug('fee histogram updated')
self._fee_histogram = histogram if histogram else []
self.feeHistogramUpdated.emit() self.feeHistogramUpdated.emit()
@pyqtProperty(int, notify=heightChanged) @pyqtProperty(int, notify=heightChanged)
@@ -109,5 +111,5 @@ class QENetwork(QObject, QtEventListener):
@pyqtProperty('QVariant', notify=feeHistogramUpdated) @pyqtProperty('QVariant', notify=feeHistogramUpdated)
def feeHistogram(self): def feeHistogram(self):
return self.network.get_status_value('fee_histogram') return self._fee_histogram