aboutsummaryrefslogtreecommitdiff
path: root/test/functional/p2p_invalid_tx.py
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-08-24 15:26:42 -0400
committerMarcoFalke <falke.marco@gmail.com>2018-08-31 10:27:19 -0400
commitfac3e22b18cd29053bc17065fd75db7b84ba6f40 (patch)
treee1d3be9941db440e645c8fbd9f270fea2a80a90a /test/functional/p2p_invalid_tx.py
parentb012bbe358311cc4a73300ccca41b64272250277 (diff)
qa: Read reject reasons from debug log, not p2p messages
Diffstat (limited to 'test/functional/p2p_invalid_tx.py')
-rwxr-xr-xtest/functional/p2p_invalid_tx.py15
1 files changed, 2 insertions, 13 deletions
diff --git a/test/functional/p2p_invalid_tx.py b/test/functional/p2p_invalid_tx.py
index 12bc62131f..be0290edfd 100755
--- a/test/functional/p2p_invalid_tx.py
+++ b/test/functional/p2p_invalid_tx.py
@@ -116,7 +116,8 @@ class InvalidTxRequestTest(BitcoinTestFramework):
assert_equal(2, len(node.getpeerinfo())) # p2ps[1] is still connected
self.log.info('Send the withhold tx ... ')
- node.p2p.send_txs_and_test([tx_withhold], node, success=True)
+ with node.assert_debug_log(expected_msgs=["bad-txns-in-belowout"]):
+ node.p2p.send_txs_and_test([tx_withhold], node, success=True)
# Transactions that should end up in the mempool
expected_mempool = {
@@ -134,18 +135,6 @@ class InvalidTxRequestTest(BitcoinTestFramework):
wait_until(lambda: 1 == len(node.getpeerinfo()), timeout=12) # p2ps[1] is no longer connected
assert_equal(expected_mempool, set(node.getrawmempool()))
- # restart node with sending BIP61 messages disabled, check that it disconnects without sending the reject message
- self.log.info('Test a transaction that is rejected, with BIP61 disabled')
- self.restart_node(0, ['-enablebip61=0', '-persistmempool=0'])
- self.reconnect_p2p(num_connections=1)
- with node.assert_debug_log(expected_msgs=[
- "{} from peer=0 was not accepted: mandatory-script-verify-flag-failed (Invalid OP_IF construction) (code 16)".format(tx1.hash),
- "disconnecting peer=0",
- ]):
- node.p2p.send_txs_and_test([tx1], node, success=False, expect_disconnect=True)
- # send_txs_and_test will have waited for disconnect, so we can safely check that no reject has been received
- assert_equal(node.p2p.reject_code_received, None)
-
if __name__ == '__main__':
InvalidTxRequestTest().main()