Skip to content

Commit f1fc61f

Browse files
author
Tom Trevethan
committed
removed mintxfee
1 parent 31741b3 commit f1fc61f

File tree

3 files changed

+1
-63
lines changed

3 files changed

+1
-63
lines changed

src/wallet/wallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3024,7 +3024,7 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
30243024

30253025
if (args.IsArgSet("-mintxfee")) {
30263026
std::optional<CAmount> min_tx_fee = ParseMoney(args.GetArg("-mintxfee", ""));
3027-
if (!min_tx_fee || (!Params().GetConsensus().allow_any_fee && min_tx_fee.value() == 0)) {
3027+
if (!min_tx_fee || min_tx_fee.value() == 0) {
30283028
error = AmountErrMsg("mintxfee", args.GetArg("-mintxfee", ""));
30293029
return nullptr;
30303030
} else if (min_tx_fee.value() > HIGH_TX_FEE_PER_KB) {

test/functional/test_runner.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@
356356
'feature_coinstatsindex.py --legacy-wallet',
357357
'feature_coinstatsindex.py --descriptors',
358358
'wallet_orphanedreward.py',
359-
'wallet_send_zero_fee.py',
360359
'wallet_timelock.py',
361360
'p2p_node_network_limited.py',
362361
'p2p_permissions.py',

test/functional/wallet_send_zero_fee.py

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)