foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-03 09:56:38 -05:00
Code Issues Activity

refactor: Remove unused request.fHelp

Browse source
This commit is contained in:
MarcoFalke 2020-06-11 10:35:13 -04:00
parent fad889cbf0
commit fadf6bd04f
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/wallet/rpcwallet.cpp
View file

@ -93,6 +93,7 @@ bool GetWalletNameFromJSONRPCRequest(const JSONRPCRequest& request, std::string&
std::shared_ptr<CWallet> GetWalletForJSONRPCRequest(const JSONRPCRequest& request) std::shared_ptr<CWallet> GetWalletForJSONRPCRequest(const JSONRPCRequest& request)
{ {
CHECK_NONFATAL(!request.fHelp);
std::string wallet_name; std::string wallet_name;
if (GetWalletNameFromJSONRPCRequest(request, wallet_name)) { if (GetWalletNameFromJSONRPCRequest(request, wallet_name)) {
std::shared_ptr<CWallet> pwallet = GetWallet(wallet_name); std::shared_ptr<CWallet> pwallet = GetWallet(wallet_name);
@ -101,12 +102,10 @@ std::shared_ptr<CWallet> GetWalletForJSONRPCRequest(const JSONRPCRequest& reques
} }
std::vector<std::shared_ptr<CWallet>> wallets = GetWallets(); std::vector<std::shared_ptr<CWallet>> wallets = GetWallets();
if (wallets.size() == 1 || (request.fHelp && wallets.size() > 0)) { if (wallets.size() == 1) {
return wallets[0]; return wallets[0];
} }
if (request.fHelp) return nullptr;
if (!HasWallets()) { if (!HasWallets()) {
throw JSONRPCError( throw JSONRPCError(
RPC_METHOD_NOT_FOUND, "Method not found (wallet method is disabled because no wallet is loaded)"); RPC_METHOD_NOT_FOUND, "Method not found (wallet method is disabled because no wallet is loaded)");