diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2017-10-31 20:22:41 -1000 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-11-03 10:07:59 -0400 |
| commit | 6372a7558194e82981cd564d258edac9a8424ba0 (patch) | |
| tree | 72f3d1a0fb5b2e14cf7c968e3ae7460d19796d33 | |
| parent | 8195cb0d7fc4f8699b35aff7a43ed2fb3013608c (diff) | |
| download | bitcoin-6372a7558194e82981cd564d258edac9a8424ba0.tar.xz | |
[Wallet] always show help-line of wallet encryption calls
Github-Pull: #11590
Rebased-From: 720d9e8fa1d1c7516e8278eaaf60789d2f2c8a53
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 6efbc23281..06fb4dc053 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2106,7 +2106,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" @@ -2170,7 +2170,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" @@ -2221,7 +2221,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" @@ -2261,7 +2261,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" |