sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[qa] Respond to getheaders and do not assume a getdata on inv

Browse Source
This commit is contained in:
Matt Corallo 2016-10-03 18:30:52 -04:00
parent d768f151f6
commit 3451203b5c
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qa/rpc-tests/p2p-compactblocks.py
View File

@ -27,6 +27,7 @@ class TestNode(SingleNodeConnCB):
self.last_cmpctblock = None self.last_cmpctblock = None
self.block_announced = False self.block_announced = False
self.last_getdata = None self.last_getdata = None
self.last_getheaders = None
self.last_getblocktxn = None self.last_getblocktxn = None
self.last_block = None self.last_block = None
self.last_blocktxn = None self.last_blocktxn = None
@ -64,6 +65,9 @@ class TestNode(SingleNodeConnCB):
def on_getdata(self, conn, message): def on_getdata(self, conn, message):
self.last_getdata = message self.last_getdata = message
def on_getheaders(self, conn, message):
self.last_getheaders = message
def on_getblocktxn(self, conn, message): def on_getblocktxn(self, conn, message):
self.last_getblocktxn = message self.last_getblocktxn = message
@ -393,6 +397,9 @@ class CompactBlocksTest(BitcoinTestFramework):
if announce == "inv": if announce == "inv":
test_node.send_message(msg_inv([CInv(2, block.sha256)])) test_node.send_message(msg_inv([CInv(2, block.sha256)]))
success = wait_until(lambda: test_node.last_getheaders is not None, timeout=30)
assert(success)
test_node.send_header_for_blocks([block])
else: else:
test_node.send_header_for_blocks([block]) test_node.send_header_for_blocks([block])
success = wait_until(lambda: test_node.last_getdata is not None, timeout=30) success = wait_until(lambda: test_node.last_getdata is not None, timeout=30)

14
qa/rpc-tests/p2p-segwit.py
View File

@ -64,6 +64,9 @@ class TestNode(NodeConnCB):
self.getdataset.add(inv.hash) self.getdataset.add(inv.hash)
self.last_getdata = message self.last_getdata = message
def on_getheaders(self, conn, message):
self.last_getheaders = message
def on_pong(self, conn, message): def on_pong(self, conn, message):
self.last_pong = message self.last_pong = message
@ -97,6 +100,10 @@ class TestNode(NodeConnCB):
test_function = lambda: self.last_getdata != None test_function = lambda: self.last_getdata != None
self.sync(test_function, timeout) self.sync(test_function, timeout)
def wait_for_getheaders(self, timeout=60):
test_function = lambda: self.last_getheaders != None
self.sync(test_function, timeout)
def wait_for_inv(self, expected_inv, timeout=60): def wait_for_inv(self, expected_inv, timeout=60):
test_function = lambda: self.last_inv != expected_inv test_function = lambda: self.last_inv != expected_inv
self.sync(test_function, timeout) self.sync(test_function, timeout)
@ -111,12 +118,15 @@ class TestNode(NodeConnCB):
def announce_block_and_wait_for_getdata(self, block, use_header, timeout=60): def announce_block_and_wait_for_getdata(self, block, use_header, timeout=60):
with mininode_lock: with mininode_lock:
self.last_getdata = None self.last_getdata = None
self.last_getheaders = None
msg = msg_headers()
msg.headers = [ CBlockHeader(block) ]
if use_header: if use_header:
msg = msg_headers()
msg.headers = [ CBlockHeader(block) ]
self.send_message(msg) self.send_message(msg)
else: else:
self.send_message(msg_inv(inv=[CInv(2, block.sha256)])) self.send_message(msg_inv(inv=[CInv(2, block.sha256)]))
self.wait_for_getheaders()
self.send_message(msg)
self.wait_for_getdata() self.wait_for_getdata()
return return

11
qa/rpc-tests/sendheaders.py
View File

@ -348,14 +348,13 @@ class SendHeadersTest(BitcoinTestFramework):
if j == 0: if j == 0:
# Announce via inv # Announce via inv
test_node.send_block_inv(tip) test_node.send_block_inv(tip)
test_node.wait_for_getdata([tip], timeout=5) test_node.wait_for_getheaders(timeout=5)
# Should have received a getheaders now
test_node.send_header_for_blocks(blocks)
# Test that duplicate inv's won't result in duplicate # Test that duplicate inv's won't result in duplicate
# getdata requests, or duplicate headers announcements # getdata requests, or duplicate headers announcements
inv_node.send_block_inv(tip) [ inv_node.send_block_inv(x.sha256) for x in blocks ]
# Should have received a getheaders as well! test_node.wait_for_getdata([x.sha256 for x in blocks], timeout=5)
test_node.send_header_for_blocks(blocks)
test_node.wait_for_getdata([x.sha256 for x in blocks[0:-1]], timeout=5)
[ inv_node.send_block_inv(x.sha256) for x in blocks[0:-1] ]
inv_node.sync_with_ping() inv_node.sync_with_ping()
else: else:
# Announce via headers # Announce via headers