Skip to content

Commit fadf6bd

Browse files
author
MarcoFalke
committed
refactor: Remove unused request.fHelp
1 parent fad889c commit fadf6bd

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/wallet/rpcwallet.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ bool GetWalletNameFromJSONRPCRequest(const JSONRPCRequest& request, std::string&
9393

9494
std::shared_ptr<CWallet> GetWalletForJSONRPCRequest(const JSONRPCRequest& request)
9595
{
96+
CHECK_NONFATAL(!request.fHelp);
9697
std::string wallet_name;
9798
if (GetWalletNameFromJSONRPCRequest(request, wallet_name)) {
9899
std::shared_ptr<CWallet> pwallet = GetWallet(wallet_name);
@@ -101,12 +102,10 @@ std::shared_ptr<CWallet> GetWalletForJSONRPCRequest(const JSONRPCRequest& reques
101102
}
102103

103104
std::vector<std::shared_ptr<CWallet>> wallets = GetWallets();
104-
if (wallets.size() == 1 || (request.fHelp && wallets.size() > 0)) {
105+
if (wallets.size() == 1) {
105106
return wallets[0];
106107
}
107108

108-
if (request.fHelp) return nullptr;
109-
110109
if (!HasWallets()) {
111110
throw JSONRPCError(
112111
RPC_METHOD_NOT_FOUND, "Method not found (wallet method is disabled because no wallet is loaded)");

0 commit comments

Comments
 (0)