foster/bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-03 13:44:42 -05:00
Code Issues Activity

qt, wallet: Drop unused parameter in WalletModel::setWalletEncrypted

Browse source
This commit is contained in:
Hennadii Stepanov 2020-10-28 18:43:42 +02:00
parent f886a20b02
commit 4146a31ccb
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/qt/askpassphrasedialog.cpp
View file

@ -125,8 +125,7 @@ void AskPassphraseDialog::accept()
"</b></qt>");
} else {
assert(model != nullptr);
if(model->setWalletEncrypted(true, newpass1))
{
if (model->setWalletEncrypted(newpass1)) {
QMessageBox::warning(this, tr("Wallet encrypted"),
"<qt>" +
tr("Your wallet is now encrypted. ") + encryption_reminder +
@ -136,9 +135,7 @@ void AskPassphraseDialog::accept()
"For security reasons, previous backups of the unencrypted wallet file "
"will become useless as soon as you start using the new, encrypted wallet.") +
"</b></qt>");
}
else
{
} else {
QMessageBox::critical(this, tr("Wallet encryption failed"),
tr("Wallet encryption failed due to an internal error. Your wallet was not encrypted."));
}

7
src/qt/walletmodel.cpp
View file

@ -313,12 +313,9 @@ WalletModel::EncryptionStatus WalletModel::getEncryptionStatus() const
}
}
bool WalletModel::setWalletEncrypted(bool encrypted, const SecureString &passphrase)
bool WalletModel::setWalletEncrypted(const SecureString& passphrase)
{
if (encrypted) {
return m_wallet->encryptWallet(passphrase);
}
return false;
return m_wallet->encryptWallet(passphrase);
}
bool WalletModel::setWalletLocked(bool locked, const SecureString &passPhrase)

2
src/qt/walletmodel.h
View file

@ -105,7 +105,7 @@ public:
SendCoinsReturn sendCoins(WalletModelTransaction &transaction);
// Wallet encryption
bool setWalletEncrypted(bool encrypted, const SecureString &passphrase);
bool setWalletEncrypted(const SecureString& passphrase);
// Passphrase only needed when unlocking
bool setWalletLocked(bool locked, const SecureString &passPhrase=SecureString());
bool changePassphrase(const SecureString &oldPass, const SecureString &newPass);