Skip to content

Commit fa21568

Browse files
author
MarcoFalke
committed
qa: Avoid race in p2p_invalid_block by waiting for the block request
1 parent 6c787d3 commit fa21568

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

test/functional/p2p_invalid_block.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ def run_test(self):
7777
block2.vtx.append(tx2)
7878
assert_equal(block2.hashMerkleRoot, block2.calc_merkle_root())
7979
assert_equal(orig_hash, block2.rehash())
80-
assert(block2_orig.vtx != block2.vtx)
80+
assert block2_orig.vtx != block2.vtx
8181

82-
node.p2p.send_blocks_and_test([block2], node, success=False, request_block=False, reject_reason='bad-txns-duplicate')
82+
node.p2p.send_blocks_and_test([block2], node, success=False, reject_reason='bad-txns-duplicate')
8383

8484
# Check transactions for duplicate inputs
8585
self.log.info("Test duplicate input block.")
@@ -89,7 +89,7 @@ def run_test(self):
8989
block2_orig.hashMerkleRoot = block2_orig.calc_merkle_root()
9090
block2_orig.rehash()
9191
block2_orig.solve()
92-
node.p2p.send_blocks_and_test([block2_orig], node, success=False, request_block=False, reject_reason='bad-txns-inputs-duplicate')
92+
node.p2p.send_blocks_and_test([block2_orig], node, success=False, reject_reason='bad-txns-inputs-duplicate')
9393

9494
self.log.info("Test very broken block.")
9595

@@ -102,7 +102,8 @@ def run_test(self):
102102
block3.rehash()
103103
block3.solve()
104104

105-
node.p2p.send_blocks_and_test([block3], node, success=False, request_block=False, reject_reason='bad-cb-amount')
105+
node.p2p.send_blocks_and_test([block3], node, success=False, reject_reason='bad-cb-amount')
106+
106107

107108
if __name__ == '__main__':
108109
InvalidBlockRequestTest().main()

0 commit comments

Comments
 (0)