Merge #19423: test: add functional test for txrelay during and after IBD
cb31ee01b4
[test] feefilter during and after IBD (gzhao408) Pull request description: This is a followup to #19204 which uses `minfeefilter=MAX_MONEY` to effectively shut off txrelay, thereby reducing inv traffic, when nodes are in IBD. It was [missing](https://github.com/bitcoin/bitcoin/pull/19204#issuecomment-644040070) a functional test. ACKs for top commit: jnewbery: utACKcb31ee01b4
Tree-SHA512: a9effc8193fa95fb42a2f9c66b258cc7b0941fc04c1ce3a6092f4426c9bfc7e72f702aca559b3e30e90652497f411f22fae3cf5cdb6cfd6ef6d37fed712cda67
This commit is contained in:
commit
19aaf7945e
2 changed files with 45 additions and 0 deletions
44
test/functional/p2p_ibd_txrelay.py
Executable file
44
test/functional/p2p_ibd_txrelay.py
Executable file
|
@ -0,0 +1,44 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
# Copyright (c) 2020 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 fee filters during and after IBD."""
|
||||||
|
|
||||||
|
from decimal import Decimal
|
||||||
|
|
||||||
|
from test_framework.messages import COIN
|
||||||
|
from test_framework.test_framework import BitcoinTestFramework
|
||||||
|
from test_framework.util import assert_equal
|
||||||
|
|
||||||
|
MAX_FEE_FILTER = Decimal(9170997) / COIN
|
||||||
|
NORMAL_FEE_FILTER = Decimal(100) / COIN
|
||||||
|
|
||||||
|
|
||||||
|
class P2PIBDTxRelayTest(BitcoinTestFramework):
|
||||||
|
def set_test_params(self):
|
||||||
|
self.setup_clean_chain = True
|
||||||
|
self.num_nodes = 2
|
||||||
|
self.extra_args = [
|
||||||
|
["-minrelaytxfee={}".format(NORMAL_FEE_FILTER)],
|
||||||
|
["-minrelaytxfee={}".format(NORMAL_FEE_FILTER)],
|
||||||
|
]
|
||||||
|
def run_test(self):
|
||||||
|
self.log.info("Check that nodes set minfilter to MAX_MONEY while still in IBD")
|
||||||
|
for node in self.nodes:
|
||||||
|
assert node.getblockchaininfo()['initialblockdownload']
|
||||||
|
for conn_info in node.getpeerinfo():
|
||||||
|
assert_equal(conn_info['minfeefilter'], MAX_FEE_FILTER)
|
||||||
|
|
||||||
|
# Come out of IBD by generating a block
|
||||||
|
self.nodes[0].generate(1)
|
||||||
|
self.sync_all()
|
||||||
|
|
||||||
|
self.log.info("Check that nodes reset minfilter after coming out of IBD")
|
||||||
|
for node in self.nodes:
|
||||||
|
assert not node.getblockchaininfo()['initialblockdownload']
|
||||||
|
for conn_info in node.getpeerinfo():
|
||||||
|
assert_equal(conn_info['minfeefilter'], NORMAL_FEE_FILTER)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
P2PIBDTxRelayTest().main()
|
|
@ -248,6 +248,7 @@ BASE_SCRIPTS = [
|
||||||
'rpc_help.py',
|
'rpc_help.py',
|
||||||
'feature_help.py',
|
'feature_help.py',
|
||||||
'feature_shutdown.py',
|
'feature_shutdown.py',
|
||||||
|
'p2p_ibd_txrelay.py',
|
||||||
# Don't append tests at the end to avoid merge conflicts
|
# Don't append tests at the end to avoid merge conflicts
|
||||||
# Put them in a random line within the section that fits their approximate run-time
|
# Put them in a random line within the section that fits their approximate run-time
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in a new issue