[electrum] misc cleanups of ElectrumWindow.broadcast_transaction
ClosedPublic
Actions

Authored by PiRK on Nov 24 2023, 11:40.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rABCb60b02ab8132: [electrum] misc cleanups of ElectrumWindow.broadcast_transaction

Summary

Minor code cleanups:

remove unnecessary variables
invert some logic to remove nesting (indentatation) by returning early when possible
use x is not None instead of not x when x is an Optional[something]
move same-line comments to previous line
add a few typehints

Test Plan

send a transaction

Diff Detail

Repository

rABC Bitcoin ABC

Branch

broadcast_notif_multitx

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 25727
Build 51034: Build Diff	electrum-tests
Build 51033: arc lint + arc unit

Event Timeline

PiRK created this revision.Nov 24 2023, 11:40

Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 24 2023, 11:40

PiRK requested review of this revision.Nov 24 2023, 11:40

Harbormaster completed remote builds in B25726: Diff 43251.Nov 24 2023, 11:42

add typehint for callback parameter

Harbormaster completed remote builds in B25727: Diff 43252.Nov 24 2023, 11:46

PiRK added a child revision: D14848: [electrum] move-only: move the early exit conditions before the broadcast functions in broadcast_transaction.Nov 24 2023, 11:51

PiRK added inline comments.Nov 24 2023, 11:53

electrum/electrumabc_gui/qt/main_window.py
2674–2675	These two vars are always redefined when needed

Fabien added a subscriber: Fabien.Nov 24 2023, 12:55

Fabien added inline comments.

electrum/electrumabc_gui/qt/main_window.py
2761	from the previous version it seems result can be None ?

PiRK added inline comments.Nov 24 2023, 13:01

electrum/electrumabc_gui/qt/main_window.py
2761	The only thing that could make it `None` is is `self.network.broadcast_transaction(tx)` returns None, but it does that only it we pass it a `callback` argument.

PiRK added inline comments.Nov 24 2023, 13:02

electrum/electrumabc_gui/qt/main_window.py
2761	The `broadcast_done` function takes it input from the output of the `broadcast_thread` function.

as per discussion, I will add back the check for if result: just in case it can sometimes be None, to keep this diff a cleanup only with no possible change of behavior.