diff --git a/test/functional/p2p_node_network_limited.py b/test/functional/p2p_node_network_limited.py index 9cd9e91025..f3d289cb47 100755 --- a/test/functional/p2p_node_network_limited.py +++ b/test/functional/p2p_node_network_limited.py @@ -8,7 +8,7 @@ Tests that a node configured with -prune=2200 signals NODE_NETWORK_LIMITED corre and that it responds to getdata requests for blocks correctly: - send a block within 288 + 2 of the tip - disconnect peers who request blocks older than that.""" -from test_framework.messages import NODE_MWEB_LIGHT_CLIENT, CInv, MSG_BLOCK, msg_getdata, msg_verack, NODE_NETWORK_LIMITED, NODE_WITNESS, NODE_MWEB +from test_framework.messages import CInv, MSG_BLOCK, msg_getdata, msg_verack, NODE_MWEB, NODE_MWEB_LIGHT_CLIENT, NODE_NETWORK_LIMITED, NODE_WITNESS from test_framework.p2p import P2PInterface from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( @@ -35,7 +35,7 @@ class NodeNetworkLimitedTest(BitcoinTestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 3 - self.extra_args = [['-prune=2200', '-peerblockfilters=0', '-blockfilterindex=0', '-addrmantest'], [], []] + self.extra_args = [['-prune=2200', '-addrmantest'], [], []] def disconnect_all(self): self.disconnect_nodes(0, 1) diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py index 9b5e9437ff..a14399bb0e 100755 --- a/test/functional/rpc_blockchain.py +++ b/test/functional/rpc_blockchain.py @@ -54,7 +54,7 @@ class BlockchainTest(BitcoinTestFramework): def run_test(self): self.mine_chain() - self.restart_node(0, extra_args=['-stopatheight=207', '-prune=1', '-peerblockfilters=0', '-blockfilterindex=0', '-vbparams=mweb:-2:0']) # Set extra args with pruning after rescan is complete + self.restart_node(0, extra_args=['-stopatheight=207', '-prune=1', '-vbparams=mweb:-2:0']) # Set extra args with pruning after rescan is complete self._test_getblockchaininfo() self._test_getchaintxstats() @@ -113,7 +113,7 @@ class BlockchainTest(BitcoinTestFramework): # should have exact keys assert_equal(sorted(res.keys()), keys) - self.restart_node(0, ['-stopatheight=207', '-prune=2200', '-peerblockfilters=0', '-blockfilterindex=0', '-vbparams=mweb:-2:0']) + self.restart_node(0, ['-stopatheight=207', '-prune=2200', '-vbparams=mweb:-2:0']) res = self.nodes[0].getblockchaininfo() # result should have these additional pruning keys if prune=2200 assert_equal(sorted(res.keys()), sorted(['pruneheight', 'automatic_pruning', 'prune_target_size'] + keys)) diff --git a/test/functional/wallet_import_rescan.py b/test/functional/wallet_import_rescan.py index 34632fe9e2..aad112b499 100755 --- a/test/functional/wallet_import_rescan.py +++ b/test/functional/wallet_import_rescan.py @@ -153,7 +153,7 @@ class ImportRescanTest(BitcoinTestFramework): self.extra_args = [[] for _ in range(self.num_nodes)] for i, import_node in enumerate(IMPORT_NODES, 2): if import_node.prune: - self.extra_args[i] += ["-prune=1", "-peerblockfilters=0", "-blockfilterindex=0"] + self.extra_args[i] += ["-prune=1"] self.add_nodes(self.num_nodes, extra_args=self.extra_args)