RPC/Wallet: unloadwallet: Clarify docs/error when both the RPC request and wallet_name parameter specify a wallet #20462

2791 | @@ -2792,7 +2792,7 @@ static RPCHelpMan unloadwallet()
2792 |                  "Unloads the wallet referenced by the request endpoint otherwise unloads the wallet specified in the argument.\n"
2793 |                  "Specifying the wallet name on a wallet endpoint is invalid.",
2794 |                  {
2795 | -                    {"wallet_name", RPCArg::Type::STR, /* default */ "the wallet name from the RPC request", "The name of the wallet to unload."},
2796 | +                    {"wallet_name", RPCArg::Type::STR, /* default */ "the wallet name from the RPC request", "The name of the wallet to unload. Must be provided in the RPC request or this parameter (but not both)."},

promag commented at 2:16 PM on November 23, 2020:

RPC request or RPC endpoint?

 354 | @@ -355,7 +355,7 @@ 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, "Both the RPC request wallet and wallet_name parameter were provided (only one allowed)", w1.unloadwallet, "w2"),

jonatack commented at 2:46 PM on November 23, 2020:

Please include a test with the same wallet name, e.g. w1.unloadwallet, w1.getwalletinfo()["walletname"]