diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-05-30 21:19:02 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-05-30 21:33:56 +0200 |
| commit | b9ef5a10e2fa4609d048db57b99463305455ebe4 (patch) | |
| tree | 2aa2e6c13c2767b64c4b250f69084bbb03dbe71d /src | |
| parent | 269fa667f24850602be07d360af1541cfb17359b (diff) | |
| parent | 151009cf76f3f1adc17630d5370bf019be127373 (diff) | |
| download | bitcoin-b9ef5a10e2fa4609d048db57b99463305455ebe4.tar.xz | |
Merge bitcoin-core/gui#609: wallet, refactor: Drop unused `WalletModel::PaymentRequestExpired`
151009cf76f3f1adc17630d5370bf019be127373 qt, wallet, refactor: Drop unused `WalletModel::PaymentRequestExpired` (Hennadii Stepanov)
Pull request description:
The `PaymentRequestExpired` value in the `WalletModel::StatusCode` enumeration has been unused since bitcoin/bitcoin#17165.
ACKs for top commit:
furszy:
ACK 151009cf, no usage for it.
kristapsk:
cr ACK 151009cf76f3f1adc17630d5370bf019be127373, checked that `PaymentRequestExpired` is not referenced anywhere else.
Tree-SHA512: c2ea3443af5d369ca294d79559869f688aaa806b91ffe0090f3b34638a8377ec2f11d6f5c09cc2d11ab55035850237e60e992acba671097a6642c6bb9e709273
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/sendcoinsdialog.cpp | 4 | ||||
| -rw-r--r-- | src/qt/walletmodel.h | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index fd8eccb86d..d8daccecbd 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -757,10 +757,6 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn case WalletModel::AbsurdFee: msgParams.first = tr("A fee higher than %1 is considered an absurdly high fee.").arg(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), model->wallet().getDefaultMaxTxFee())); break; - case WalletModel::PaymentRequestExpired: - msgParams.first = tr("Payment request expired."); - msgParams.second = CClientUIInterface::MSG_ERROR; - break; // included to prevent a compiler warning. case WalletModel::OK: default: diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index 540fdaafe3..d524d48111 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -66,8 +66,7 @@ public: AmountWithFeeExceedsBalance, DuplicateAddress, TransactionCreationFailed, // Error returned when wallet is still locked - AbsurdFee, - PaymentRequestExpired + AbsurdFee }; enum EncryptionStatus |