[Wallet] always show help-line of wallet encryption calls

This commit is contained in:
Jonas Schnelli 2017-10-31 20:22:41 -10:00
parent 8335cb4781
commit 720d9e8fa1
No known key found for this signature in database
GPG key ID: 1EB776BB03C7922D

View file

@ -2179,7 +2179,7 @@ UniValue walletpassphrase(const JSONRPCRequest& request)
return NullUniValue;
}
if (pwallet->IsCrypted() && (request.fHelp || request.params.size() != 2)) {
if (request.fHelp || request.params.size() != 2) {
throw std::runtime_error(
"walletpassphrase \"passphrase\" timeout\n"
"\nStores the wallet decryption key in memory for 'timeout' seconds.\n"
@ -2243,7 +2243,7 @@ UniValue walletpassphrasechange(const JSONRPCRequest& request)
return NullUniValue;
}
if (pwallet->IsCrypted() && (request.fHelp || request.params.size() != 2)) {
if (request.fHelp || request.params.size() != 2) {
throw std::runtime_error(
"walletpassphrasechange \"oldpassphrase\" \"newpassphrase\"\n"
"\nChanges the wallet passphrase from 'oldpassphrase' to 'newpassphrase'.\n"
@ -2294,7 +2294,7 @@ UniValue walletlock(const JSONRPCRequest& request)
return NullUniValue;
}
if (pwallet->IsCrypted() && (request.fHelp || request.params.size() != 0)) {
if (request.fHelp || request.params.size() != 0) {
throw std::runtime_error(
"walletlock\n"
"\nRemoves the wallet encryption key from memory, locking the wallet.\n"
@ -2334,7 +2334,7 @@ UniValue encryptwallet(const JSONRPCRequest& request)
return NullUniValue;
}
if (!pwallet->IsCrypted() && (request.fHelp || request.params.size() != 1)) {
if (request.fHelp || request.params.size() != 1) {
throw std::runtime_error(
"encryptwallet \"passphrase\"\n"
"\nEncrypts the wallet with 'passphrase'. This is for first time encryption.\n"