highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-20 13:53:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #20282: wallet: change upgradewallet return type to be an object

Browse Source 
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
This commit is contained in:
Samuel Dobson 2020-11-04 14:42:54 +13:00
commit 17c6fb176a
No known key found for this signature in database
GPG Key ID: D300116E1C875A3D
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/wallet/rpcwallet.cpp
View File

@ -4443,7 +4443,12 @@ static RPCHelpMan upgradewallet()
{ {
{"version", RPCArg::Type::NUM, /* default */ strprintf("%d", FEATURE_LATEST), "The version number to upgrade to. Default is the latest wallet version"} {"version", RPCArg::Type::NUM, /* default */ strprintf("%d", FEATURE_LATEST), "The version number to upgrade to. Default is the latest wallet version"}
}, },
RPCResults{}, RPCResult{
RPCResult::Type::OBJ, "", "",
{
{RPCResult::Type::STR, "error", /* optional */ true, "Error message (if there is one)"}
},
},
RPCExamples{ RPCExamples{
HelpExampleCli("upgradewallet", "169900") HelpExampleCli("upgradewallet", "169900")
+ HelpExampleRpc("upgradewallet", "169900") + HelpExampleRpc("upgradewallet", "169900")
@ -4468,7 +4473,11 @@ static RPCHelpMan upgradewallet()
if (!pwallet->UpgradeWallet(version, error, warnings)) { if (!pwallet->UpgradeWallet(version, error, warnings)) {
throw JSONRPCError(RPC_WALLET_ERROR, error.original); throw JSONRPCError(RPC_WALLET_ERROR, error.original);
} }
return error.original; UniValue obj(UniValue::VOBJ);
if (!error.empty()) {
obj.pushKV("error", error.original);
}
return obj;
}, },
}; };
} }

4
test/functional/wallet_upgradewallet.py
View File

@ -107,7 +107,7 @@ class UpgradeWalletTest(BitcoinTestFramework):
# calling upgradewallet without version arguments # calling upgradewallet without version arguments
# should return nothing if successful # should return nothing if successful
assert_equal(wallet.upgradewallet(), "") assert_equal(wallet.upgradewallet(), {})
new_version = wallet.getwalletinfo()["walletversion"] new_version = wallet.getwalletinfo()["walletversion"]
# upgraded wallet version should be greater than older one # upgraded wallet version should be greater than older one
assert_greater_than(new_version, old_version) assert_greater_than(new_version, old_version)
@ -130,7 +130,7 @@ class UpgradeWalletTest(BitcoinTestFramework):
assert_equal('hdseedid' in wallet.getwalletinfo(), False) assert_equal('hdseedid' in wallet.getwalletinfo(), False)
# calling upgradewallet with explicit version number # calling upgradewallet with explicit version number
# should return nothing if successful # should return nothing if successful
assert_equal(wallet.upgradewallet(169900), "") assert_equal(wallet.upgradewallet(169900), {})
new_version = wallet.getwalletinfo()["walletversion"] new_version = wallet.getwalletinfo()["walletversion"]
# upgraded wallet should have version 169900 # upgraded wallet should have version 169900
assert_equal(new_version, 169900) assert_equal(new_version, 169900)