RPC/Wallet: unloadwallet: Allow specifying wallet_name param matching RPC endpoint wallet #20448

 354 | @@ -355,12 +355,18 @@ def wallet_file(name):
 355 |          assert_raises_rpc_error(-1, "JSON value is not a string as expected", self.nodes[0].unloadwallet)
 356 |          assert_raises_rpc_error(-18, "Requested wallet does not exist or is not loaded", self.nodes[0].unloadwallet, "dummy")
 357 |          assert_raises_rpc_error(-18, "Requested wallet does not exist or is not loaded", node.get_wallet_rpc("dummy").unloadwallet)
 358 | -        assert_raises_rpc_error(-8, "Cannot unload the requested wallet", w1.unloadwallet, "w2"),
 359 | +        assert_raises_rpc_error(-8, "RPC request wallet and wallet_name parameter specify different wallets", w1.unloadwallet, "w2"),

jonatack commented at 7:49 AM on November 23, 2020:

81162ec41e5ee2ce0 For the first commit, suggest testing with the same wallet name:

-        assert_raises_rpc_error(-8, "Both the RPC request wallet and wallet_name parameter were provided (only one allowed)", w1.unloadwallet, "w2"),
+        assert_raises_rpc_error(-8, "Both the RPC request wallet and wallet_name parameter were provided (only one allowed)", w1.unloadwallet, w1.getwalletinfo()["walletname"]),

2805 | @@ -2806,8 +2806,8 @@ static RPCHelpMan unloadwallet()
2806 |  {
2807 |      std::string wallet_name;
2808 |      if (GetWalletNameFromJSONRPCRequest(request, wallet_name)) {
2809 | -        if (!request.params[0].isNull()) {
2810 | -            throw JSONRPCError(RPC_INVALID_PARAMETER, "Cannot unload the requested wallet");
2811 | +        if (!(request.params[0].isNull() || request.params[0].get_str() == wallet_name)) {

jonatack commented at 8:09 AM on November 23, 2020:

2e9ada51830236a027371a48697b96 nit, would find this clearer

        if (!request.params[0].isNull() && request.params[0].get_str() != wallet_name) {

luke-jr commented at 1:53 PM on November 23, 2020:

That's strictly less clear (it relies on implicit precedence order)