diff options
Diffstat (limited to 'test/functional/p2p_sendheaders.py')
| -rwxr-xr-x | test/functional/p2p_sendheaders.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/functional/p2p_sendheaders.py b/test/functional/p2p_sendheaders.py index db706556d8..7dc91305f3 100755 --- a/test/functional/p2p_sendheaders.py +++ b/test/functional/p2p_sendheaders.py @@ -115,28 +115,28 @@ class BaseNode(P2PInterface): msg = msg_getdata() for x in block_hashes: msg.inv.append(CInv(MSG_BLOCK, x)) - self.send_message(msg) + self.send_without_ping(msg) def send_get_headers(self, locator, hashstop): msg = msg_getheaders() msg.locator.vHave = locator msg.hashstop = hashstop - self.send_message(msg) + self.send_without_ping(msg) def send_block_inv(self, blockhash): msg = msg_inv() msg.inv = [CInv(MSG_BLOCK, blockhash)] - self.send_message(msg) + self.send_without_ping(msg) def send_header_for_blocks(self, new_blocks): headers_message = msg_headers() headers_message.headers = [CBlockHeader(b) for b in new_blocks] - self.send_message(headers_message) + self.send_without_ping(headers_message) def send_getblocks(self, locator): getblocks_message = msg_getblocks() getblocks_message.locator.vHave = locator - self.send_message(getblocks_message) + self.send_without_ping(getblocks_message) def wait_for_block_announcement(self, block_hash, timeout=60): test_function = lambda: self.last_blockhash_announced == block_hash @@ -252,7 +252,7 @@ class SendHeadersTest(BitcoinTestFramework): test_node.sync_with_ping() assert_equal(test_node.block_announced, False) inv_node.clear_block_announcements() - test_node.send_message(msg_block(block)) + test_node.send_without_ping(msg_block(block)) inv_node.check_last_inv_announcement(inv=[int(block.hash, 16)]) def test_nonnull_locators(self, test_node, inv_node): @@ -298,7 +298,7 @@ class SendHeadersTest(BitcoinTestFramework): # PART 2 # 2. Send a sendheaders message and test that headers announcements # commence and keep working. - test_node.send_message(msg_sendheaders()) + test_node.send_without_ping(msg_sendheaders()) prev_tip = int(self.nodes[0].getbestblockhash(), 16) test_node.send_get_headers(locator=[prev_tip], hashstop=0) test_node.sync_with_ping() @@ -348,7 +348,7 @@ class SendHeadersTest(BitcoinTestFramework): # getdata requests (the check is further down) inv_node.send_header_for_blocks(blocks) inv_node.sync_with_ping() - [test_node.send_message(msg_block(x)) for x in blocks] + [test_node.send_without_ping(msg_block(x)) for x in blocks] test_node.sync_with_ping() inv_node.sync_with_ping() # This block should not be announced to the inv node (since it also @@ -444,7 +444,7 @@ class SendHeadersTest(BitcoinTestFramework): tip = blocks[-1].sha256 block_time += 1 height += 1 - inv_node.send_message(msg_block(blocks[-1])) + inv_node.send_without_ping(msg_block(blocks[-1])) inv_node.sync_with_ping() # Make sure blocks are processed test_node.last_message.pop("getdata", None) @@ -467,7 +467,7 @@ class SendHeadersTest(BitcoinTestFramework): test_node.sync_with_ping() test_node.wait_for_getdata([x.sha256 for x in blocks], timeout=DIRECT_FETCH_RESPONSE_TIME) - [test_node.send_message(msg_block(x)) for x in blocks] + [test_node.send_without_ping(msg_block(x)) for x in blocks] test_node.sync_with_ping() @@ -514,7 +514,7 @@ class SendHeadersTest(BitcoinTestFramework): self.log.info("Part 4: success!") # Now deliver all those blocks we announced. - [test_node.send_message(msg_block(x)) for x in blocks] + [test_node.send_without_ping(msg_block(x)) for x in blocks] self.log.info("Part 5: Testing handling of unconnecting headers") # First we test that receipt of an unconnecting header doesn't prevent @@ -537,7 +537,7 @@ class SendHeadersTest(BitcoinTestFramework): test_node.wait_for_getheaders(block_hash=expected_hash) test_node.send_header_for_blocks(blocks) test_node.wait_for_getdata([x.sha256 for x in blocks]) - [test_node.send_message(msg_block(x)) for x in blocks] + [test_node.send_without_ping(msg_block(x)) for x in blocks] test_node.sync_with_ping() assert_equal(int(self.nodes[0].getbestblockhash(), 16), blocks[1].sha256) expected_hash = blocks[1].sha256 |