diff options
| author | Jon Atack <jon@atack.com> | 2020-08-08 13:22:19 +0200 |
|---|---|---|
| committer | Jon Atack <jon@atack.com> | 2020-08-26 11:57:27 +0200 |
| commit | aa3621385ee66c9dde5c632c0a79fba3a6ea2d62 (patch) | |
| tree | 4f29c6cfc3d15e78c6828e19dce50f3a06a22115 /test/functional | |
| parent | 24ee4f01eadb870435712950a1364cf0def06e9f (diff) | |
test: use CInv::MSG_WITNESS_TX flag in p2p_segwit
Diffstat (limited to 'test/functional')
| -rwxr-xr-x | test/functional/p2p_segwit.py | 3 | ||||
| -rwxr-xr-x | test/functional/test_framework/messages.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/test/functional/p2p_segwit.py b/test/functional/p2p_segwit.py index 564e49f3d8..b80e7994be 100755 --- a/test/functional/p2p_segwit.py +++ b/test/functional/p2p_segwit.py @@ -25,6 +25,7 @@ from test_framework.messages import ( MSG_BLOCK, MSG_TX, MSG_WITNESS_FLAG, + MSG_WITNESS_TX, MSG_WTX, NODE_NETWORK, NODE_WITNESS, @@ -2158,7 +2159,7 @@ class SegWitTest(BitcoinTestFramework): self.wtx_node.wait_for_getdata([tx.sha256], 60) with mininode_lock: lgd = self.wtx_node.lastgetdata[:] - assert_equal(lgd, [CInv(MSG_TX|MSG_WITNESS_FLAG, tx.sha256)]) + assert_equal(lgd, [CInv(MSG_WITNESS_TX, tx.sha256)]) # Send tx through test_transaction_acceptance(self.nodes[0], self.wtx_node, tx, with_witness=False, accepted=True) diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py index 5207b563a1..5e411e35a8 100755 --- a/test/functional/test_framework/messages.py +++ b/test/functional/test_framework/messages.py @@ -63,6 +63,7 @@ MSG_CMPCT_BLOCK = 4 MSG_WTX = 5 MSG_WITNESS_FLAG = 1 << 30 MSG_TYPE_MASK = 0xffffffff >> 2 +MSG_WITNESS_TX = MSG_TX | MSG_WITNESS_FLAG FILTER_TYPE_BASIC = 0 |