aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJon Atack <jon@atack.com>2020-11-17 19:18:12 +0100
committerJon Atack <jon@atack.com>2020-11-19 20:00:56 +0100
commit3eb6f8b2e61c24a22ea9396d86672307845f35eb (patch)
tree40b93928a05d3dba8a9a59863379291815679502 /test
parentca8cd893bb56bf5d455154b0498b1f58f77d20ed (diff)
downloadbitcoin-3eb6f8b2e61c24a22ea9396d86672307845f35eb.tar.xz
wallet (not for backport): improve upgradewallet error messages
Diffstat (limited to 'test')
-rwxr-xr-xtest/functional/wallet_upgradewallet.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/functional/wallet_upgradewallet.py b/test/functional/wallet_upgradewallet.py
index 9b8410e0d5..d0bb6135a8 100755
--- a/test/functional/wallet_upgradewallet.py
+++ b/test/functional/wallet_upgradewallet.py
@@ -211,7 +211,8 @@ class UpgradeWalletTest(BitcoinTestFramework):
self.log.info('Wallets cannot be downgraded')
copy_non_hd()
- self.test_upgradewallet_error(wallet, previous_version=60000, requested_version=40000, msg="Cannot downgrade wallet")
+ self.test_upgradewallet_error(wallet, previous_version=60000, requested_version=40000,
+ msg="Cannot downgrade wallet from version 60000 to version 40000. Wallet version unchanged.")
wallet.unloadwallet()
assert_equal(before_checksum, sha256sum_file(node_master_wallet))
node_master.loadwallet('')
@@ -250,7 +251,8 @@ class UpgradeWalletTest(BitcoinTestFramework):
self.log.info('Cannot upgrade to HD Split, needs Pre Split Keypool')
for version in [139900, 159900, 169899]:
self.test_upgradewallet_error(wallet, previous_version=130000, requested_version=version,
- msg="Cannot upgrade a non HD split wallet without upgrading to support pre split keypool. Please use version 169900 or no version specified.")
+ msg="Cannot upgrade a non HD split wallet from version {} to version {} without upgrading to "
+ "support pre-split keypool. Please use version 169900 or no version specified.".format(130000, version))
self.log.info('Upgrade HD to HD chain split')
self.test_upgradewallet(wallet, previous_version=130000, requested_version=169900)