diff options
| author | Jon Atack <jon@atack.com> | 2020-03-10 18:40:57 +0100 |
|---|---|---|
| committer | Jon Atack <jon@atack.com> | 2020-03-26 17:54:21 +0100 |
| commit | 4a0b27bb01738e6917e27b2cf47f9a8536249693 (patch) | |
| tree | a6a1c09e18f53b30d21e979397b86b95ac940247 /src | |
| parent | e347cfa9a7244277f9d220a4dc3537182f18441e (diff) | |
| download | bitcoin-4a0b27bb01738e6917e27b2cf47f9a8536249693.tar.xz | |
wallet: remove totalfee from createBumpTransaction()
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/wallet.cpp | 9 | ||||
| -rw-r--r-- | src/interfaces/wallet.h | 1 | ||||
| -rw-r--r-- | src/qt/walletmodel.cpp | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp index 01ade56b2a..e444a6634d 100644 --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -253,19 +253,12 @@ public: } bool createBumpTransaction(const uint256& txid, const CCoinControl& coin_control, - CAmount total_fee, std::vector<std::string>& errors, CAmount& old_fee, CAmount& new_fee, CMutableTransaction& mtx) override { - if (total_fee > 0) { - return feebumper::CreateTotalBumpTransaction(m_wallet.get(), txid, coin_control, total_fee, errors, old_fee, new_fee, mtx) == - feebumper::Result::OK; - } else { - return feebumper::CreateRateBumpTransaction(*m_wallet.get(), txid, coin_control, errors, old_fee, new_fee, mtx) == - feebumper::Result::OK; - } + return feebumper::CreateRateBumpTransaction(*m_wallet.get(), txid, coin_control, errors, old_fee, new_fee, mtx) == feebumper::Result::OK; } bool signBumpTransaction(CMutableTransaction& mtx) override { return feebumper::SignTransaction(*m_wallet.get(), mtx); } bool commitBumpTransaction(const uint256& txid, diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h index 9476c9f77f..f3da7ca611 100644 --- a/src/interfaces/wallet.h +++ b/src/interfaces/wallet.h @@ -155,7 +155,6 @@ public: //! Create bump transaction. virtual bool createBumpTransaction(const uint256& txid, const CCoinControl& coin_control, - CAmount total_fee, std::vector<std::string>& errors, CAmount& old_fee, CAmount& new_fee, diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 8a84a8c168..9b072c5266 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -482,7 +482,7 @@ bool WalletModel::bumpFee(uint256 hash, uint256& new_hash) CAmount old_fee; CAmount new_fee; CMutableTransaction mtx; - if (!m_wallet->createBumpTransaction(hash, coin_control, 0 /* totalFee */, errors, old_fee, new_fee, mtx)) { + if (!m_wallet->createBumpTransaction(hash, coin_control, errors, old_fee, new_fee, mtx)) { QMessageBox::critical(nullptr, tr("Fee bump error"), tr("Increasing transaction fee failed") + "<br />(" + (errors.size() ? QString::fromStdString(errors[0]) : "") +")"); return false; |