Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

backport: trivial 2024 10 25 pr1 #6362

Merged
merged 23 commits into from
Oct 27, 2024
Merged

backport: trivial 2024 10 25 pr1 #6362

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3070c3e
Merge bitcoin/bitcoin#30078: depends: set AR & RANLIB for CMake
fanquake May 14, 2024
3be0d3e
Merge bitcoin/bitcoin#30097: crypto: disable asan for sha256_sse4 wit…
fanquake May 16, 2024
63e139d
Merge bitcoin/bitcoin#30185: guix: show `*_FLAGS` variables in pre-bu…
fanquake Jun 5, 2024
ca83773
Merge bitcoin/bitcoin#30283: upnp: fix build with miniupnpc 2.2.8
fanquake Jun 19, 2024
479cb8b
Merge bitcoin/bitcoin#30312: contrib: add R(UN)PATH check to ELF symb…
fanquake Jun 26, 2024
9793fb1
Merge bitcoin/bitcoin#30340: test: Added coverage to Block not found …
achow101 Jul 2, 2024
ebed8af
Merge bitcoin/bitcoin#30336: depends: update doc in Qt pwd patch
fanquake Jul 12, 2024
69c04b2
Merge bitcoin/bitcoin#30372: util: Use SteadyClock in RandAddSeedPerfmon
fanquake Jul 12, 2024
4e144be
Merge bitcoin-core/gui#795: Keep focus on "Hide" while ModalOverlay i…
hebasto Jul 15, 2024
745addf
Merge bitcoin/bitcoin#30245: net: Allow -proxy=[::1] on nodes with IP…
achow101 Jul 18, 2024
62dcd43
Merge bitcoin/bitcoin#29880: depends: build FreeType with CMake
fanquake Jul 19, 2024
e016ffa
Merge bitcoin/bitcoin#29878: depends: build expat with CMake
fanquake Jul 24, 2024
57945ce
Merge bitcoin/bitcoin#30506: depends: Cleanup postprocess commands af…
fanquake Jul 25, 2024
df3c239
Merge bitcoin/bitcoin#26950: cleanse: switch to SecureZeroMemory for …
fanquake Jul 26, 2024
e4e5605
Merge bitcoin/bitcoin#30552: test: fix constructor of msg_tx
fanquake Jul 31, 2024
ddaec96
Merge bitcoin/bitcoin#30565: depends: Fix `zeromq` build on OpenBSD
fanquake Aug 1, 2024
f66547f
Merge bitcoin/bitcoin#30588: depends: fix ZMQ CMake getcachesize check
fanquake Aug 6, 2024
8a12237
Merge bitcoin/bitcoin#30630: doc: Update ccache website link
fanquake Aug 12, 2024
1bd090e
Merge bitcoin/bitcoin#30597: doc: Drop no longer needed workaround fo…
fanquake Aug 12, 2024
432f352
Merge bitcoin/bitcoin#30580: doc: Add note about distro's `g++-mingw-…
fanquake Aug 12, 2024
01b570e
Merge bitcoin/bitcoin#29999: guix: fix suggested fake date for openss…
achow101 Aug 12, 2024
745a819
Merge bitcoin/bitcoin#30690: devtools, utxo-snapshot: Fix block heigh…
achow101 Aug 26, 2024
b654479
Merge bitcoin/bitcoin#30705: test: Avoid intermittent block download …
fanquake Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions test/functional/test_framework/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1724,8 +1724,11 @@ class msg_tx:
__slots__ = ("tx",)
msgtype = b"tx"

def __init__(self, tx=CTransaction()):
self.tx = tx
def __init__(self, tx=None):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing changes for class CMerkleBlock (same bug):

--- a/test/functional/test_framework/messages.py
+++ b/test/functional/test_framework/messages.py
@@ -1069,9 +1069,16 @@ class CPartialMerkleTree:
 class CMerkleBlock:
     __slots__ = ("header", "txn")
 
-    def __init__(self, header=CBlockHeader(), txn=CPartialMerkleTree()):
+    def __init__(self, header=None, txn=None):
+        if header is None:
+            self.header = CBlockHeader()
+        else:
+            self.header = header
         self.header = header
-        self.txn = txn
+        if txn is None:
+            self.txn = CPartialMerkleTree()
+        else:
+            self.txn = txn

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed: #6373

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

if tx is None:
self.tx = CTransaction()
else:
self.tx = tx

def deserialize(self, f):
self.tx.deserialize(f)
Expand Down