Skip to content

Commit

Permalink
Reverting unnecessary functional test changes
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidBurkett committed Oct 13, 2024
1 parent 196d709 commit beae01d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions test/functional/p2p_node_network_limited.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
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 (
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions test/functional/rpc_blockchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def set_test_params(self):

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()
Expand Down Expand Up @@ -113,7 +113,7 @@ def _test_getblockchaininfo(self):
# 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))
Expand Down
2 changes: 1 addition & 1 deletion test/functional/wallet_import_rescan.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def setup_network(self):
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)

Expand Down

0 comments on commit beae01d

Please sign in to comment.