diff options
| author | Samuel Dobson <dobsonsa68@gmail.com> | 2020-11-04 14:42:54 +1300 |
|---|---|---|
| committer | Samuel Dobson <dobsonsa68@gmail.com> | 2020-11-04 14:51:42 +1300 |
| commit | 17c6fb176a07d86f96f7cf41164c4b71cd1b3765 (patch) | |
| tree | dd79ed6e79147e2aede1b41f3205e0bc6d26b1af /test/functional | |
| parent | 95bde34a7186edb559efeeea7f2fbc0fbdd06273 (diff) | |
| parent | 2ead31fb1b17c9b183a4b81f0ae4f48e5cf67d64 (diff) | |
Merge #20282: wallet: change upgradewallet return type to be an object
2ead31fb1b17c9b183a4b81f0ae4f48e5cf67d64 [wallet] Return object from upgradewallet RPC (Sishir Giri)
Pull request description:
Change the return type of upgradewallet to be an object for future extensibility.
Also return any error string returned from the `UpgradeWallet()` function.
ACKs for top commit:
MarcoFalke:
ACK 2ead31fb1b17c9b183a4b81f0ae4f48e5cf67d64
meshcollider:
Tested ACK 2ead31fb1b17c9b183a4b81f0ae4f48e5cf67d64
Tree-SHA512: bcc7432d2f35093ec2463ea19e894fa885b698c0e8d8e4bd2f979bd4d722cbfed53ec589d6280968917893c64649dc9e40800b8d854273b0f9a1380f51afbdb1
Diffstat (limited to 'test/functional')
| -rwxr-xr-x | test/functional/wallet_upgradewallet.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/wallet_upgradewallet.py b/test/functional/wallet_upgradewallet.py index 446a601aee..15d9b109c5 100755 --- a/test/functional/wallet_upgradewallet.py +++ b/test/functional/wallet_upgradewallet.py @@ -107,7 +107,7 @@ class UpgradeWalletTest(BitcoinTestFramework): # calling upgradewallet without version arguments # should return nothing if successful - assert_equal(wallet.upgradewallet(), "") + assert_equal(wallet.upgradewallet(), {}) new_version = wallet.getwalletinfo()["walletversion"] # upgraded wallet version should be greater than older one assert_greater_than(new_version, old_version) @@ -130,7 +130,7 @@ class UpgradeWalletTest(BitcoinTestFramework): assert_equal('hdseedid' in wallet.getwalletinfo(), False) # calling upgradewallet with explicit version number # should return nothing if successful - assert_equal(wallet.upgradewallet(169900), "") + assert_equal(wallet.upgradewallet(169900), {}) new_version = wallet.getwalletinfo()["walletversion"] # upgraded wallet should have version 169900 assert_equal(new_version, 169900) |