zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto merge of #4508 - oxarbitrage:remove_fhelp_from_impls, r=str4d 

Remove unused fHelp parameters from internal functions

- dumpwallet_impl
- importwallet_impl
This commit is contained in:
Homu 2020-05-12 12:42:58 +00:00
parent d0b533aacb 3995fb634b
commit d52003861c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wallet/rpcdump.cpp
View File

@ -27,8 +27,8 @@ using namespace std;
void EnsureWalletIsUnlocked(); void EnsureWalletIsUnlocked();
bool EnsureWalletIsAvailable(bool avoidException); bool EnsureWalletIsAvailable(bool avoidException);
UniValue dumpwallet_impl(const UniValue& params, bool fHelp, bool fDumpZKeys); UniValue dumpwallet_impl(const UniValue& params, bool fDumpZKeys);
UniValue importwallet_impl(const UniValue& params, bool fHelp, bool fImportZKeys); UniValue importwallet_impl(const UniValue& params, bool fImportZKeys);
std::string static EncodeDumpTime(int64_t nTime) { std::string static EncodeDumpTime(int64_t nTime) {
@ -326,7 +326,7 @@ UniValue z_importwallet(const UniValue& params, bool fHelp)
+ HelpExampleRpc("z_importwallet", "\"path/to/exportdir/nameofbackup\"") + HelpExampleRpc("z_importwallet", "\"path/to/exportdir/nameofbackup\"")
); );
return importwallet_impl(params, fHelp, true); return importwallet_impl(params, true);
} }
UniValue importwallet(const UniValue& params, bool fHelp) UniValue importwallet(const UniValue& params, bool fHelp)
@ -349,10 +349,10 @@ UniValue importwallet(const UniValue& params, bool fHelp)
+ HelpExampleRpc("importwallet", "\"path/to/exportdir/nameofbackup\"") + HelpExampleRpc("importwallet", "\"path/to/exportdir/nameofbackup\"")
); );
return importwallet_impl(params, fHelp, false); return importwallet_impl(params, false);
} }
UniValue importwallet_impl(const UniValue& params, bool fHelp, bool fImportZKeys) UniValue importwallet_impl(const UniValue& params, bool fImportZKeys)
{ {
if (fPruneMode) if (fPruneMode)
throw JSONRPCError(RPC_WALLET_ERROR, "Importing wallets is disabled in pruned mode"); throw JSONRPCError(RPC_WALLET_ERROR, "Importing wallets is disabled in pruned mode");
@ -525,7 +525,7 @@ UniValue z_exportwallet(const UniValue& params, bool fHelp)
+ HelpExampleRpc("z_exportwallet", "\"test\"") + HelpExampleRpc("z_exportwallet", "\"test\"")
); );
return dumpwallet_impl(params, fHelp, true); return dumpwallet_impl(params, true);
} }
UniValue dumpwallet(const UniValue& params, bool fHelp) UniValue dumpwallet(const UniValue& params, bool fHelp)
@ -546,10 +546,10 @@ UniValue dumpwallet(const UniValue& params, bool fHelp)
+ HelpExampleRpc("dumpwallet", "\"test\"") + HelpExampleRpc("dumpwallet", "\"test\"")
); );
return dumpwallet_impl(params, fHelp, false); return dumpwallet_impl(params, false);
} }
UniValue dumpwallet_impl(const UniValue& params, bool fHelp, bool fDumpZKeys) UniValue dumpwallet_impl(const UniValue& params, bool fDumpZKeys)
{ {
LOCK2(cs_main, pwalletMain->cs_wallet); LOCK2(cs_main, pwalletMain->cs_wallet);