Skip to content

Commit 7418169

Browse files
author
MarcoFalke
committed
Merge #18997: gui: Remove un-actionable TODO
4444dbf gui: Remove un-actionable TODO (MarcoFalke) Pull request description: With encryption turned on by default for all wallets in consideration (#18889), I believe that wallet decryption will not be implemented ever or at least any time soon. So remove that TODO comment for now. If deemed important, a brainstorming issue can be opened instead. Also remove some TODOs in the RPC console, which I don't understand. Maybe the gui was meant to show the debug log interactively? In any case, if deemed important, this should be filed as a brainstorming feature request, so that trade-offs of different solutions can be discussed. ACKs for top commit: laanwj: Thanks. ACK 4444dbf achow101: ACK 4444dbf Tree-SHA512: f7ddb37a14178f575da5409ea1c34e34bde37d79b2b56eaaf606a069e2b91c9d7b734529f5c68664b2fa5aa831117c8d19cce823743671cd6c31b81d68b8c70c
2 parents cfe22a5 + 4444dbf commit 7418169

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

src/qt/bitcoingui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,15 +1251,15 @@ void BitcoinGUI::setEncryptionStatus(int status)
12511251
labelWalletEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>unlocked</b>"));
12521252
encryptWalletAction->setChecked(true);
12531253
changePassphraseAction->setEnabled(true);
1254-
encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
1254+
encryptWalletAction->setEnabled(false);
12551255
break;
12561256
case WalletModel::Locked:
12571257
labelWalletEncryptionIcon->show();
12581258
labelWalletEncryptionIcon->setPixmap(platformStyle->SingleColorIcon(":/icons/lock_closed").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
12591259
labelWalletEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>locked</b>"));
12601260
encryptWalletAction->setChecked(true);
12611261
changePassphraseAction->setEnabled(true);
1262-
encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
1262+
encryptWalletAction->setEnabled(false);
12631263
break;
12641264
}
12651265
}

src/qt/rpcconsole.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,14 @@
3131
#include <QKeyEvent>
3232
#include <QMenu>
3333
#include <QMessageBox>
34-
#include <QScrollBar>
3534
#include <QScreen>
35+
#include <QScrollBar>
3636
#include <QSettings>
3737
#include <QString>
3838
#include <QStringList>
3939
#include <QTime>
4040
#include <QTimer>
4141

42-
// TODO: add a scrollback limit, as there is currently none
43-
// TODO: make it possible to filter out categories (esp debug messages when implemented)
44-
// TODO: receive errors and debug messages through ClientModel
4542

4643
const int CONSOLE_HISTORY = 50;
4744
const int INITIAL_TRAFFIC_GRAPH_MINS = 30;

src/qt/walletmodel.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -317,16 +317,10 @@ WalletModel::EncryptionStatus WalletModel::getEncryptionStatus() const
317317

318318
bool WalletModel::setWalletEncrypted(bool encrypted, const SecureString &passphrase)
319319
{
320-
if(encrypted)
321-
{
322-
// Encrypt
320+
if (encrypted) {
323321
return m_wallet->encryptWallet(passphrase);
324322
}
325-
else
326-
{
327-
// Decrypt -- TODO; not supported yet
328-
return false;
329-
}
323+
return false;
330324
}
331325

332326
bool WalletModel::setWalletLocked(bool locked, const SecureString &passPhrase)

0 commit comments

Comments
 (0)