highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-08 21:59:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Return std::optional from GetWalletNameFromJSONRPCRequest

Browse Source
This commit is contained in:
MarcoFalke
2026-03-27 14:12:03 +01:00
parent fafb0c4cbe
commit fa0a09441d
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/wallet/rpc/util.cpp
View File

@@ -32,14 +32,13 @@ bool GetAvoidReuseFlag(const CWallet& wallet, const UniValue& param) {
std::string EnsureUniqueWalletName(const JSONRPCRequest& request, std::optional<std::string_view> wallet_name) std::string EnsureUniqueWalletName(const JSONRPCRequest& request, std::optional<std::string_view> wallet_name)
{ {
std::string endpoint_wallet; if (auto endpoint_wallet{GetWalletNameFromJSONRPCRequest(request)}) {
if (GetWalletNameFromJSONRPCRequest(request, endpoint_wallet)) {
// wallet endpoint was used // wallet endpoint was used
if (wallet_name && *wallet_name != endpoint_wallet) { if (wallet_name && *wallet_name != *endpoint_wallet) {
throw JSONRPCError(RPC_INVALID_PARAMETER, throw JSONRPCError(RPC_INVALID_PARAMETER,
"The RPC endpoint wallet and the wallet name parameter specify different wallets"); "The RPC endpoint wallet and the wallet name parameter specify different wallets");
} }
return endpoint_wallet; return *endpoint_wallet;
} }
// Not a wallet endpoint; parameter must be provided // Not a wallet endpoint; parameter must be provided
@@ -51,14 +50,13 @@ std::string EnsureUniqueWalletName(const JSONRPCRequest& request, std::optional<
return std::string{*wallet_name}; return std::string{*wallet_name};
} }
bool GetWalletNameFromJSONRPCRequest(const JSONRPCRequest& request, std::string& wallet_name) std::optional<std::string> GetWalletNameFromJSONRPCRequest(const JSONRPCRequest& request)
{ {
if (request.URI.starts_with(WALLET_ENDPOINT_BASE)) { if (request.URI.starts_with(WALLET_ENDPOINT_BASE)) {
// wallet endpoint was used // wallet endpoint was used
wallet_name = UrlDecode(std::string_view{request.URI}.substr(WALLET_ENDPOINT_BASE.size())); return UrlDecode(std::string_view{request.URI}.substr(WALLET_ENDPOINT_BASE.size()));
return true;
} }
return false; return std::nullopt;
} }
std::shared_ptr<CWallet> GetWalletForJSONRPCRequest(const JSONRPCRequest& request) std::shared_ptr<CWallet> GetWalletForJSONRPCRequest(const JSONRPCRequest& request)
@@ -66,9 +64,8 @@ std::shared_ptr<CWallet> GetWalletForJSONRPCRequest(const JSONRPCRequest& reques
CHECK_NONFATAL(request.mode == JSONRPCRequest::EXECUTE); CHECK_NONFATAL(request.mode == JSONRPCRequest::EXECUTE);
WalletContext& context = EnsureWalletContext(request.context); WalletContext& context = EnsureWalletContext(request.context);
std::string wallet_name; if (auto wallet_name{GetWalletNameFromJSONRPCRequest(request)}) {
if (GetWalletNameFromJSONRPCRequest(request, wallet_name)) { std::shared_ptr<CWallet> pwallet{GetWallet(context, *wallet_name)};
std::shared_ptr<CWallet> pwallet = GetWallet(context, wallet_name);
if (!pwallet) throw JSONRPCError(RPC_WALLET_NOT_FOUND, "Requested wallet does not exist or is not loaded"); if (!pwallet) throw JSONRPCError(RPC_WALLET_NOT_FOUND, "Requested wallet does not exist or is not loaded");
return pwallet; return pwallet;
} }

2
src/wallet/rpc/util.h
View File

@@ -39,7 +39,7 @@ static const RPCResult RESULT_LAST_PROCESSED_BLOCK { RPCResult::Type::OBJ, "last
* @return nullptr if no wallet should be used, or a pointer to the CWallet * @return nullptr if no wallet should be used, or a pointer to the CWallet
*/ */
std::shared_ptr<CWallet> GetWalletForJSONRPCRequest(const JSONRPCRequest& request); std::shared_ptr<CWallet> GetWalletForJSONRPCRequest(const JSONRPCRequest& request);
bool GetWalletNameFromJSONRPCRequest(const JSONRPCRequest& request, std::string& wallet_name); std::optional<std::string> GetWalletNameFromJSONRPCRequest(const JSONRPCRequest& request);
/** /**
* Ensures that a wallet name is specified across the endpoint and wallet_name. * Ensures that a wallet name is specified across the endpoint and wallet_name.
* Throws `RPC_INVALID_PARAMETER` if none or different wallet names are specified. * Throws `RPC_INVALID_PARAMETER` if none or different wallet names are specified.