aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2018-06-01 14:02:16 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2018-06-01 14:03:09 +0200
commite24bf1ce184bc8d5bba70a3f3e9c43c2df07f4d3 (patch)
tree214b014331762f7c9f090ff1e458ae194ddc4904
parentd4f6dac9abf8e81e90c1726fa81850799a67bff9 (diff)
parentfaac7a2db4f9f511c901cb1b4d4e7c599b92884f (diff)
downloadbitcoin-e24bf1ce184bc8d5bba70a3f3e9c43c2df07f4d3.tar.xz
Merge #13352: qa: Avoid checking reject code for now
faac7a2db4f9f511c901cb1b4d4e7c599b92884f qa: Avoid checking reject code for now (MarcoFalke) Pull request description: The node will often disconnect before sending a reject code. A more robust solution would be to read from the debug log. See #13006 Tree-SHA512: 1dabf8a43dabbc722f4ffe4fbc1f870090253a66290b2d1a95e7a24e14c6442b493c314480c0314587164eb65e5d468aa9eb5e107ad90bb3ca821a97ea4d373c
-rwxr-xr-xtest/functional/p2p_invalid_tx.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/functional/p2p_invalid_tx.py b/test/functional/p2p_invalid_tx.py
index 34041ca109..3fed872ccc 100755
--- a/test/functional/p2p_invalid_tx.py
+++ b/test/functional/p2p_invalid_tx.py
@@ -21,8 +21,6 @@ from test_framework.util import (
)
-REJECT_INVALID = 16
-
class InvalidTxRequestTest(BitcoinTestFramework):
def set_test_params(self):
self.num_nodes = 1
@@ -73,7 +71,7 @@ class InvalidTxRequestTest(BitcoinTestFramework):
# and we get disconnected immediately
self.log.info('Test a transaction that is rejected')
tx1 = create_transaction(block1.vtx[0], 0, b'\x64' * 35, 50 * COIN - 12000)
- node.p2p.send_txs_and_test([tx1], node, success=False, expect_disconnect=True, reject_code=REJECT_INVALID, reject_reason=b'mandatory-script-verify-flag-failed (Invalid OP_IF construction)')
+ node.p2p.send_txs_and_test([tx1], node, success=False, expect_disconnect=True)
# Make two p2p connections to provide the node with orphans
# * p2ps[0] will send valid orphan txs (one with low fee)