mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 04:22:55 +01:00
9d0a82b02e
854382885f18aa9a95cdde3d11591b05c305ad3f refactor: test: improve wait_for{header,merkleblock} interface (Sebastian Falbesoner)
1356a45ef042e7bd3d539fbb606d6b1be547d00f test: complete impl. of msg_merkleblock and wait_for_merkleblock (Sebastian Falbesoner)
Pull request description:
Implements the missing initialization/serialization methods for `msg_merkleblock`, based on the already present class `CMerkleBlock`. Also changes the method `wait_for_merkleblock()` to be more precise by waiting for a merkleblock with a specified blockhash instead of an arbitrary one.
In the BIP37 test `p2p_filter.py`, this new method is used to make the test of receiving merkleblock and tx if a filter is set to be more precise, by checking if they also arrive in the right order.
In the course of this PR, also the interface for the methods `wait_for_merkleblock()` and `wait_for_header()` are improved to take a hex string instead of an integer, which is more typesafe and less of a burden to the caller.
ACKs for top commit:
MarcoFalke:
ACK 854382885f18aa9a95cdde3d11591b05c305ad3f
Tree-SHA512: adaf0ac728ef0b9929cb417a7a7b4c1346c400b2d365bf6914515c67b6cfe8f4a7ecc62fb514afdce9792f0bed833416f6bca6b9620f3d5dcdc66e4d5b0b7ea3
44 lines
1.9 KiB
Python
Executable File
44 lines
1.9 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# Copyright (c) 2015-2017 The Bitcoin Core developers
|
|
# Distributed under the MIT software license, see the accompanying
|
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
"""Test node responses to invalid locators.
|
|
"""
|
|
|
|
from test_framework.messages import msg_getheaders, msg_getblocks, MAX_LOCATOR_SZ
|
|
from test_framework.mininode import P2PInterface
|
|
from test_framework.test_framework import BitcoinTestFramework
|
|
|
|
|
|
class InvalidLocatorTest(BitcoinTestFramework):
|
|
def set_test_params(self):
|
|
self.num_nodes = 1
|
|
self.setup_clean_chain = False
|
|
|
|
def run_test(self):
|
|
node = self.nodes[0] # convenience reference to the node
|
|
node.generatetoaddress(1, node.get_deterministic_priv_key().address) # Get node out of IBD
|
|
|
|
self.log.info('Test max locator size')
|
|
block_count = node.getblockcount()
|
|
for msg in [msg_getheaders(), msg_getblocks()]:
|
|
self.log.info('Wait for disconnect when sending {} hashes in locator'.format(MAX_LOCATOR_SZ + 1))
|
|
node.add_p2p_connection(P2PInterface())
|
|
msg.locator.vHave = [int(node.getblockhash(i - 1), 16) for i in range(block_count, block_count - (MAX_LOCATOR_SZ + 1), -1)]
|
|
node.p2p.send_message(msg)
|
|
node.p2p.wait_for_disconnect()
|
|
node.disconnect_p2ps()
|
|
|
|
self.log.info('Wait for response when sending {} hashes in locator'.format(MAX_LOCATOR_SZ))
|
|
node.add_p2p_connection(P2PInterface())
|
|
msg.locator.vHave = [int(node.getblockhash(i - 1), 16) for i in range(block_count, block_count - (MAX_LOCATOR_SZ), -1)]
|
|
node.p2p.send_message(msg)
|
|
if type(msg) == msg_getheaders:
|
|
node.p2p.wait_for_header(node.getbestblockhash())
|
|
else:
|
|
node.p2p.wait_for_block(int(node.getbestblockhash(), 16))
|
|
|
|
|
|
if __name__ == '__main__':
|
|
InvalidLocatorTest().main()
|