DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Throw an error when encryptwallet is disabled

Browse Source
This commit is contained in:
Jack Grigg
2016-10-20 12:58:20 -05:00
parent 62c0aa9e58
commit 1532cb75f3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/rpcwallet.cpp
View File

@@ -1984,7 +1984,7 @@ Value encryptwallet(const Array& params, bool fHelp)
std::string strWalletEncryptionDisabledMsg = ""; std::string strWalletEncryptionDisabledMsg = "";
if (!fEnableWalletEncryption) { if (!fEnableWalletEncryption) {
strWalletEncryptionDisabledMsg = "\nWARNING: Wallet encryption is DISABLED. This call does nothing.\n"; strWalletEncryptionDisabledMsg = "\nWARNING: Wallet encryption is DISABLED. This call always fails.\n";
} }
if (!pwalletMain->IsCrypted() && (fHelp || params.size() != 1)) if (!pwalletMain->IsCrypted() && (fHelp || params.size() != 1))
@@ -2017,7 +2017,7 @@ Value encryptwallet(const Array& params, bool fHelp)
if (fHelp) if (fHelp)
return true; return true;
if (!fEnableWalletEncryption) { if (!fEnableWalletEncryption) {
return false; throw JSONRPCError(RPC_WALLET_ENCRYPTION_FAILED, "Error: wallet encryption is disabled.");
} }
if (pwalletMain->IsCrypted()) if (pwalletMain->IsCrypted())
throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: running with an encrypted wallet, but encryptwallet was called."); throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: running with an encrypted wallet, but encryptwallet was called.");