aboutsummaryrefslogtreecommitdiff
path: root/test/functional/wallet_upgradewallet.py
diff options
context:
space:
mode:
authorMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2023-06-14 13:00:11 +0200
committerMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2023-06-21 08:49:18 +0200
commitaaaa3aefbdfca1c9243057eeefdc19940e60bf18 (patch)
tree0487012bb53a2f37cea400f843bd94255c676457 /test/functional/wallet_upgradewallet.py
parentdddd89962b26b5593860d016586ee8feb5aeea24 (diff)
downloadbitcoin-aaaa3aefbdfca1c9243057eeefdc19940e60bf18.tar.xz
test: Use TestNode *_path properties where possible
Seems odd to place the burden on test writers to hardcode the chain or datadir path for the nodes under test.
Diffstat (limited to 'test/functional/wallet_upgradewallet.py')
-rwxr-xr-xtest/functional/wallet_upgradewallet.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/functional/wallet_upgradewallet.py b/test/functional/wallet_upgradewallet.py
index 4495a7d778..a4f2a9b74d 100755
--- a/test/functional/wallet_upgradewallet.py
+++ b/test/functional/wallet_upgradewallet.py
@@ -138,11 +138,11 @@ class UpgradeWalletTest(BitcoinTestFramework):
self.log.info("Test upgradewallet RPC...")
# Prepare for copying of the older wallet
- node_master_wallet_dir = os.path.join(node_master.datadir, "regtest/wallets", self.default_wallet_name)
- node_master_wallet = os.path.join(node_master_wallet_dir, self.default_wallet_name, self.wallet_data_filename)
- v16_3_wallet = os.path.join(v16_3_node.datadir, "regtest/wallets/wallet.dat")
- v15_2_wallet = os.path.join(v15_2_node.datadir, "regtest/wallet.dat")
- split_hd_wallet = os.path.join(v15_2_node.datadir, "regtest/splithd")
+ node_master_wallet_dir = node_master.wallets_path / self.default_wallet_name
+ node_master_wallet = node_master_wallet_dir / self.default_wallet_name / self.wallet_data_filename
+ v16_3_wallet = v16_3_node.wallets_path / "wallet.dat"
+ v15_2_wallet = v15_2_node.chain_path / "wallet.dat"
+ split_hd_wallet = v15_2_node.chain_path / "splithd"
self.stop_nodes()
# Make split hd wallet