aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-05-08 09:41:39 -0400
committerMarcoFalke <falke.marco@gmail.com>2019-05-08 09:42:14 -0400
commitc459c5f70176928adcee4935813a2dbe7f4dbd51 (patch)
treebe87c837c1e2f63d75f90c62898fbdc883c5c6e2
parent49c1aa5f83d0751882413aafb42a77801daf1cd5 (diff)
parent124ea38e39320d6f63cdf24979d0c1ff92cd769c (diff)
Merge #15664: change default Python block serialization to witness
124ea38e39 change default Python block serialization to witness (Gregory Sanders) Pull request description: ACKs for commit 124ea3: stevenroose: ACK 124ea38e39320d6f63cdf24979d0c1ff92cd769c Tree-SHA512: 52877934f8a3c761cb89a618daffe73e86b008d9d32d48721392b7626aaa10d3b9aa26e4c59337729e0a2d01fc48648eef5ec3d72de531a685a2cf4f4d7579ab
-rwxr-xr-xtest/functional/test_framework/messages.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
index 7cf51d9223..954ae3c4df 100755
--- a/test/functional/test_framework/messages.py
+++ b/test/functional/test_framework/messages.py
@@ -605,7 +605,7 @@ class CBlock(CBlockHeader):
super(CBlock, self).deserialize(f)
self.vtx = deser_vector(f, CTransaction)
- def serialize(self, with_witness=False):
+ def serialize(self, with_witness=True):
r = b""
r += super(CBlock, self).serialize()
if with_witness: