boxtec
/
bitcoin
mirror of https://github.com/bitcoin/bitcoin
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

Eliminate race condition in sendheaders.py test

Browse Source 
Clear the last block announcement before mining new blocks.
pull/7308/head
Suhas Daftuar 9 years ago
parent 82a0ce09b4
commit 168915e6de
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

18
qa/rpc-tests/sendheaders.py
Unescape View File

@ -220,18 +220,20 @@ class SendHeadersTest(BitcoinTestFramework):
# mine count blocks and return the new tip # mine count blocks and return the new tip
def mine_blocks(self, count): def mine_blocks(self, count):
# Clear out last block announcement from each p2p listener
[ x.clear_last_announcement() for x in self.p2p_connections ]
self.nodes[0].generate(count) self.nodes[0].generate(count)
return int(self.nodes[0].getbestblockhash(), 16) return int(self.nodes[0].getbestblockhash(), 16)
# mine a reorg that invalidates length blocks (replacing them with # mine a reorg that invalidates length blocks (replacing them with
# length+1 blocks). # length+1 blocks).
# peers is the p2p nodes we're using; we clear their state after the # Note: we clear the state of our p2p connections after the
# to-be-reorged-out blocks are mined, so that we don't break later tests. # to-be-reorged-out blocks are mined, so that we don't break later tests.
# return the list of block hashes newly mined # return the list of block hashes newly mined
def mine_reorg(self, length, peers): def mine_reorg(self, length):
self.nodes[0].generate(length) # make sure all invalidated blocks are node0's self.nodes[0].generate(length) # make sure all invalidated blocks are node0's
sync_blocks(self.nodes, wait=0.1) sync_blocks(self.nodes, wait=0.1)
[x.clear_last_announcement() for x in peers] [x.clear_last_announcement() for x in self.p2p_connections]
tip_height = self.nodes[1].getblockcount() tip_height = self.nodes[1].getblockcount()
hash_to_invalidate = self.nodes[1].getblockhash(tip_height-(length-1)) hash_to_invalidate = self.nodes[1].getblockhash(tip_height-(length-1))
@ -245,6 +247,8 @@ class SendHeadersTest(BitcoinTestFramework):
inv_node = InvNode() inv_node = InvNode()
test_node = TestNode() test_node = TestNode()
self.p2p_connections = [inv_node, test_node]
connections = [] connections = []
connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], inv_node)) connections.append(NodeConn('127.0.0.1', p2p_port(0), self.nodes[0], inv_node))
# Set nServices to 0 for test_node, so no block download will occur outside of # Set nServices to 0 for test_node, so no block download will occur outside of
@ -303,7 +307,6 @@ class SendHeadersTest(BitcoinTestFramework):
prev_tip = int(self.nodes[0].getbestblockhash(), 16) prev_tip = int(self.nodes[0].getbestblockhash(), 16)
test_node.get_headers(locator=[prev_tip], hashstop=0L) test_node.get_headers(locator=[prev_tip], hashstop=0L)
test_node.sync_with_ping() test_node.sync_with_ping()
test_node.clear_last_announcement() # Clear out empty headers response
# Now that we've synced headers, headers announcements should work # Now that we've synced headers, headers announcements should work
tip = self.mine_blocks(1) tip = self.mine_blocks(1)
@ -352,8 +355,6 @@ class SendHeadersTest(BitcoinTestFramework):
# broadcast it) # broadcast it)
assert_equal(inv_node.last_inv, None) assert_equal(inv_node.last_inv, None)
assert_equal(inv_node.last_headers, None) assert_equal(inv_node.last_headers, None)
inv_node.clear_last_announcement()
test_node.clear_last_announcement()
tip = self.mine_blocks(1) tip = self.mine_blocks(1)
assert_equal(inv_node.check_last_announcement(inv=[tip]), True) assert_equal(inv_node.check_last_announcement(inv=[tip]), True)
assert_equal(test_node.check_last_announcement(headers=[tip]), True) assert_equal(test_node.check_last_announcement(headers=[tip]), True)
@ -368,7 +369,7 @@ class SendHeadersTest(BitcoinTestFramework):
# getheaders or inv from peer. # getheaders or inv from peer.
for j in xrange(2): for j in xrange(2):
# First try mining a reorg that can propagate with header announcement # First try mining a reorg that can propagate with header announcement
new_block_hashes = self.mine_reorg(length=7, peers=[test_node, inv_node]) new_block_hashes = self.mine_reorg(length=7)
tip = new_block_hashes[-1] tip = new_block_hashes[-1]
assert_equal(inv_node.check_last_announcement(inv=[tip]), True) assert_equal(inv_node.check_last_announcement(inv=[tip]), True)
assert_equal(test_node.check_last_announcement(headers=new_block_hashes), True) assert_equal(test_node.check_last_announcement(headers=new_block_hashes), True)
@ -376,7 +377,7 @@ class SendHeadersTest(BitcoinTestFramework):
block_time += 8 block_time += 8
# Mine a too-large reorg, which should be announced with a single inv # Mine a too-large reorg, which should be announced with a single inv
new_block_hashes = self.mine_reorg(length=8, peers=[test_node, inv_node]) new_block_hashes = self.mine_reorg(length=8)
tip = new_block_hashes[-1] tip = new_block_hashes[-1]
assert_equal(inv_node.check_last_announcement(inv=[tip]), True) assert_equal(inv_node.check_last_announcement(inv=[tip]), True)
assert_equal(test_node.check_last_announcement(inv=[tip]), True) assert_equal(test_node.check_last_announcement(inv=[tip]), True)
@ -407,7 +408,6 @@ class SendHeadersTest(BitcoinTestFramework):
test_node.get_headers(locator=[fork_point], hashstop=new_block_hashes[1]) test_node.get_headers(locator=[fork_point], hashstop=new_block_hashes[1])
test_node.get_data([tip]) test_node.get_data([tip])
test_node.wait_for_block(tip) test_node.wait_for_block(tip)
test_node.clear_last_announcement()
elif i == 2: elif i == 2:
test_node.get_data([tip]) test_node.get_data([tip])
test_node.wait_for_block(tip) test_node.wait_for_block(tip)

Write Preview
Loading…
Cancel
Save