Skip to content

Commit 9c29515

Browse files
committed
test: drop testnet4 from wallet_crosschain.py
This reverts the changes to test/functional/wallet_crosschain.py in commit 74a04f9. It's sufficient to check only one test network. The next commit will change that network away from testnet3.
1 parent 14fec63 commit 9c29515

File tree

1 file changed

+1
-28
lines changed

1 file changed

+1
-28
lines changed

test/functional/wallet_crosschain.py

+1-28
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def add_options(self, parser):
1111
self.add_wallet_options(parser)
1212

1313
def set_test_params(self):
14-
self.num_nodes = 3
14+
self.num_nodes = 2
1515
self.setup_clean_chain = True
1616

1717
def skip_test_if_missing_module(self):
@@ -24,12 +24,6 @@ def setup_network(self):
2424
self.nodes[1].chain = 'testnet3'
2525
self.nodes[1].extra_args = ['-maxconnections=0', '-prune=550'] # disable testnet sync
2626
self.nodes[1].replace_in_config([('regtest=', 'testnet='), ('[regtest]', '[test]')])
27-
28-
# Switch node 2 to testnet4 before starting it.
29-
self.nodes[2].chain = 'testnet4'
30-
self.nodes[2].extra_args = ['-maxconnections=0', '-prune=550'] # disable testnet4 sync
31-
self.nodes[2].replace_in_config([('regtest=', 'testnet4='), ('[regtest]', '[testnet4]')])
32-
3327
self.start_nodes()
3428

3529
def run_test(self):
@@ -45,40 +39,19 @@ def run_test(self):
4539
self.nodes[1].createwallet(node1_wallet)
4640
self.nodes[1].backupwallet(node1_wallet_backup)
4741
self.nodes[1].unloadwallet(node1_wallet)
48-
node2_wallet = self.nodes[2].datadir_path / 'node2_wallet'
49-
node2_wallet_backup = self.nodes[0].datadir_path / 'node2_wallet.bak'
50-
self.nodes[2].createwallet(node2_wallet)
51-
self.nodes[2].backupwallet(node2_wallet_backup)
52-
self.nodes[2].unloadwallet(node2_wallet)
5342

5443
self.log.info("Loading/restoring wallets into nodes with a different genesis block")
5544

5645
if self.options.descriptors:
5746
assert_raises_rpc_error(-18, 'Wallet file verification failed.', self.nodes[0].loadwallet, node1_wallet)
58-
assert_raises_rpc_error(-18, 'Wallet file verification failed.', self.nodes[0].loadwallet, node2_wallet)
5947
assert_raises_rpc_error(-18, 'Wallet file verification failed.', self.nodes[1].loadwallet, node0_wallet)
60-
assert_raises_rpc_error(-18, 'Wallet file verification failed.', self.nodes[2].loadwallet, node0_wallet)
61-
assert_raises_rpc_error(-18, 'Wallet file verification failed.', self.nodes[1].loadwallet, node2_wallet)
62-
assert_raises_rpc_error(-18, 'Wallet file verification failed.', self.nodes[2].loadwallet, node1_wallet)
6348
assert_raises_rpc_error(-18, 'Wallet file verification failed.', self.nodes[0].restorewallet, 'w', node1_wallet_backup)
64-
assert_raises_rpc_error(-18, 'Wallet file verification failed.', self.nodes[0].restorewallet, 'w', node2_wallet_backup)
6549
assert_raises_rpc_error(-18, 'Wallet file verification failed.', self.nodes[1].restorewallet, 'w', node0_wallet_backup)
66-
assert_raises_rpc_error(-18, 'Wallet file verification failed.', self.nodes[2].restorewallet, 'w', node0_wallet_backup)
67-
assert_raises_rpc_error(-18, 'Wallet file verification failed.', self.nodes[1].restorewallet, 'w', node2_wallet_backup)
68-
assert_raises_rpc_error(-18, 'Wallet file verification failed.', self.nodes[2].restorewallet, 'w', node1_wallet_backup)
6950
else:
7051
assert_raises_rpc_error(-4, 'Wallet files should not be reused across chains.', self.nodes[0].loadwallet, node1_wallet)
71-
assert_raises_rpc_error(-4, 'Wallet files should not be reused across chains.', self.nodes[0].loadwallet, node2_wallet)
7252
assert_raises_rpc_error(-4, 'Wallet files should not be reused across chains.', self.nodes[1].loadwallet, node0_wallet)
73-
assert_raises_rpc_error(-4, 'Wallet files should not be reused across chains.', self.nodes[2].loadwallet, node0_wallet)
74-
assert_raises_rpc_error(-4, 'Wallet files should not be reused across chains.', self.nodes[1].loadwallet, node2_wallet)
75-
assert_raises_rpc_error(-4, 'Wallet files should not be reused across chains.', self.nodes[2].loadwallet, node1_wallet)
7653
assert_raises_rpc_error(-4, 'Wallet files should not be reused across chains.', self.nodes[0].restorewallet, 'w', node1_wallet_backup)
77-
assert_raises_rpc_error(-4, 'Wallet files should not be reused across chains.', self.nodes[0].restorewallet, 'w', node2_wallet_backup)
7854
assert_raises_rpc_error(-4, 'Wallet files should not be reused across chains.', self.nodes[1].restorewallet, 'w', node0_wallet_backup)
79-
assert_raises_rpc_error(-4, 'Wallet files should not be reused across chains.', self.nodes[2].restorewallet, 'w', node0_wallet_backup)
80-
assert_raises_rpc_error(-4, 'Wallet files should not be reused across chains.', self.nodes[1].restorewallet, 'w', node2_wallet_backup)
81-
assert_raises_rpc_error(-4, 'Wallet files should not be reused across chains.', self.nodes[2].restorewallet, 'w', node1_wallet_backup)
8255

8356
if not self.options.descriptors:
8457
self.log.info("Override cross-chain wallet load protection")

0 commit comments

Comments
 (0)