diff options
| author | Sebastian Falbesoner <sebastian.falbesoner@gmail.com> | 2020-04-11 15:53:01 +0200 |
|---|---|---|
| committer | Sebastian Falbesoner <sebastian.falbesoner@gmail.com> | 2020-04-11 18:40:28 +0200 |
| commit | 854382885f18aa9a95cdde3d11591b05c305ad3f (patch) | |
| tree | 7339ed096397a4dec598d5117f0b74bce45b8a83 /test/functional/p2p_filter.py | |
| parent | 1356a45ef042e7bd3d539fbb606d6b1be547d00f (diff) | |
| download | bitcoin-854382885f18aa9a95cdde3d11591b05c305ad3f.tar.xz | |
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
Diffstat (limited to 'test/functional/p2p_filter.py')
| -rwxr-xr-x | test/functional/p2p_filter.py | 4 |
1 files changed, 2 insertions, 2 deletions
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') |