Skip to content

Commit 4a0b27b

Browse files
committed
wallet: remove totalfee from createBumpTransaction()
1 parent e347cfa commit 4a0b27b

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

src/interfaces/wallet.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -253,19 +253,12 @@ class WalletImpl : public Wallet
253253
}
254254
bool createBumpTransaction(const uint256& txid,
255255
const CCoinControl& coin_control,
256-
CAmount total_fee,
257256
std::vector<std::string>& errors,
258257
CAmount& old_fee,
259258
CAmount& new_fee,
260259
CMutableTransaction& mtx) override
261260
{
262-
if (total_fee > 0) {
263-
return feebumper::CreateTotalBumpTransaction(m_wallet.get(), txid, coin_control, total_fee, errors, old_fee, new_fee, mtx) ==
264-
feebumper::Result::OK;
265-
} else {
266-
return feebumper::CreateRateBumpTransaction(*m_wallet.get(), txid, coin_control, errors, old_fee, new_fee, mtx) ==
267-
feebumper::Result::OK;
268-
}
261+
return feebumper::CreateRateBumpTransaction(*m_wallet.get(), txid, coin_control, errors, old_fee, new_fee, mtx) == feebumper::Result::OK;
269262
}
270263
bool signBumpTransaction(CMutableTransaction& mtx) override { return feebumper::SignTransaction(*m_wallet.get(), mtx); }
271264
bool commitBumpTransaction(const uint256& txid,

src/interfaces/wallet.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ class Wallet
155155
//! Create bump transaction.
156156
virtual bool createBumpTransaction(const uint256& txid,
157157
const CCoinControl& coin_control,
158-
CAmount total_fee,
159158
std::vector<std::string>& errors,
160159
CAmount& old_fee,
161160
CAmount& new_fee,

src/qt/walletmodel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ bool WalletModel::bumpFee(uint256 hash, uint256& new_hash)
482482
CAmount old_fee;
483483
CAmount new_fee;
484484
CMutableTransaction mtx;
485-
if (!m_wallet->createBumpTransaction(hash, coin_control, 0 /* totalFee */, errors, old_fee, new_fee, mtx)) {
485+
if (!m_wallet->createBumpTransaction(hash, coin_control, errors, old_fee, new_fee, mtx)) {
486486
QMessageBox::critical(nullptr, tr("Fee bump error"), tr("Increasing transaction fee failed") + "<br />(" +
487487
(errors.size() ? QString::fromStdString(errors[0]) : "") +")");
488488
return false;

0 commit comments

Comments
 (0)