AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: remove swapStarted, swapSuccess and swapFailed signals

Browse Source 
the state property and associated stateChanged signal can be used instead
This commit is contained in:
Sander van Grieken
2023-04-14 20:34:46 +02:00
parent 98c4c86a00
commit 89003bba4a
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electrum/gui/qml/qeswaphelper.py
View File

@@ -30,9 +30,6 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener):
confirm = pyqtSignal([str], arguments=['message']) confirm = pyqtSignal([str], arguments=['message'])
error = pyqtSignal([str], arguments=['message']) error = pyqtSignal([str], arguments=['message'])
swapStarted = pyqtSignal()
swapSuccess = pyqtSignal()
swapFailed = pyqtSignal([str], arguments=['message'])
def __init__(self, parent=None): def __init__(self, parent=None):
super().__init__(parent) super().__init__(parent)
@@ -361,7 +358,6 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener):
fut = asyncio.run_coroutine_threadsafe(coro, loop) fut = asyncio.run_coroutine_threadsafe(coro, loop)
self.userinfo = _('Performing swap...') self.userinfo = _('Performing swap...')
self.state = QESwapHelper.State.Started self.state = QESwapHelper.State.Started
self.swapStarted.emit()
txid = fut.result() txid = fut.result()
try: # swaphelper might be destroyed at this point try: # swaphelper might be destroyed at this point
self.userinfo = ' '.join([ self.userinfo = ' '.join([
@@ -371,14 +367,12 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener):
_('You will need to be online to finalize the swap, or the transaction will be refunded to you after some delay.'), _('You will need to be online to finalize the swap, or the transaction will be refunded to you after some delay.'),
]) ])
self.state = QESwapHelper.State.Success self.state = QESwapHelper.State.Success
self.swapSuccess.emit()
except RuntimeError: except RuntimeError:
pass pass
except Exception as e: except Exception as e:
try: # swaphelper might be destroyed at this point try: # swaphelper might be destroyed at this point
self.state = QESwapHelper.State.Failed self.state = QESwapHelper.State.Failed
self._logger.error(str(e)) self._logger.error(str(e))
self.swapFailed.emit(str(e))
except RuntimeError: except RuntimeError:
pass pass
@@ -399,7 +393,6 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener):
fut = asyncio.run_coroutine_threadsafe(coro, loop) fut = asyncio.run_coroutine_threadsafe(coro, loop)
self.userinfo = _('Performing swap...') self.userinfo = _('Performing swap...')
self.state = QESwapHelper.State.Started self.state = QESwapHelper.State.Started
self.swapStarted.emit()
success = fut.result() success = fut.result()
try: # swaphelper might be destroyed at this point try: # swaphelper might be destroyed at this point
if success: if success:
@@ -410,11 +403,9 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener):
_('You may broadcast it before that manually, but this is not trustless.'), _('You may broadcast it before that manually, but this is not trustless.'),
]) ])
self.state = QESwapHelper.State.Success self.state = QESwapHelper.State.Success
self.swapSuccess.emit()
else: else:
self.userinfo = _('Swap failed!') self.userinfo = _('Swap failed!')
self.state = QESwapHelper.State.Failed self.state = QESwapHelper.State.Failed
self.swapFailed.emit('')
except RuntimeError: except RuntimeError:
pass pass
except Exception as e: except Exception as e:
@@ -422,7 +413,6 @@ class QESwapHelper(AuthMixin, QObject, QtEventListener):
self.userinfo = _('Swap failed!') self.userinfo = _('Swap failed!')
self.state = QESwapHelper.State.Failed self.state = QESwapHelper.State.Failed
self._logger.error(str(e)) self._logger.error(str(e))
self.swapFailed.emit(str(e))
except RuntimeError: except RuntimeError:
pass pass