From 854382885f18aa9a95cdde3d11591b05c305ad3f Mon Sep 17 00:00:00 2001 From: Sebastian Falbesoner Date: Sat, 11 Apr 2020 15:53:01 +0200 Subject: refactor: test: improve wait_for{header,merkleblock} interface The interfaces for the methods wait_for_header() and wait_for_merkleblock() are changed to take a hex string instead of an integer, improving type safety and removing the burden from the caller to always do the transformation via `int(...)`. As suggested by MarcoFalke in https://github.com/bitcoin/bitcoin/pull/18593#discussion_r407062253 --- test/functional/p2p_filter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/functional/p2p_filter.py') diff --git a/test/functional/p2p_filter.py b/test/functional/p2p_filter.py index aa2c92c277..b73d5784aa 100755 --- a/test/functional/p2p_filter.py +++ b/test/functional/p2p_filter.py @@ -68,13 +68,13 @@ class FilterTest(BitcoinTestFramework): self.log.info('Check that we receive merkleblock and tx if the filter matches a tx in a block') block_hash = self.nodes[0].generatetoaddress(1, filter_address)[0] txid = self.nodes[0].getblock(block_hash)['tx'][0] - filter_node.wait_for_merkleblock(int(block_hash, 16)) + filter_node.wait_for_merkleblock(block_hash) filter_node.wait_for_tx(txid) self.log.info('Check that we only receive a merkleblock if the filter does not match a tx in a block') filter_node.tx_received = False block_hash = self.nodes[0].generatetoaddress(1, self.nodes[0].getnewaddress())[0] - filter_node.wait_for_merkleblock(int(block_hash, 16)) + filter_node.wait_for_merkleblock(block_hash) assert not filter_node.tx_received self.log.info('Check that we not receive a tx if the filter does not match a mempool tx') -- cgit v1.2.3