aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMacroFake <falke.marco@gmail.com>2022-06-18 18:10:13 +0200
committerMacroFake <falke.marco@gmail.com>2022-06-18 18:10:17 +0200
commit8e7eeb5971444c0c93e9a89bbdcc3a51a19e09e9 (patch)
tree9c71d663b4a43fe16999f358bdb8737938322b2c
parent8be652e43964329c1f2dadd676916b53e5c40974 (diff)
parent7ca8726f6355f8738e9c49533d028123051a624b (diff)
downloadbitcoin-8e7eeb5971444c0c93e9a89bbdcc3a51a19e09e9.tar.xz
Merge bitcoin/bitcoin#25410: wallet: fix warning: "argument name 'feerate' in comment does not match parameter name"
7ca8726f6355f8738e9c49533d028123051a624b wallet: fix warning: "argument name 'feerate' in comment does not match parameter name" (furszy) Pull request description: Should solve the tiny https://github.com/bitcoin/bitcoin/pull/25005#issuecomment-1159403854. Which merely happens for the extra "=" character after the comma. ACKs for top commit: Empact: Code Review ACK https://github.com/bitcoin/bitcoin/pull/25410/commits/7ca8726f6355f8738e9c49533d028123051a624b Tree-SHA512: e5368c1114f715bd93cb653c607fd0942ab0b79f709ed7aa627b3fc7e7efd096c92c5c86908c7f26c363b21e391a8faa812727eb32c285e54da3ce0429290361
-rw-r--r--src/wallet/spend.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
index 60a28a22e9..4547dc4133 100644
--- a/src/wallet/spend.cpp
+++ b/src/wallet/spend.cpp
@@ -232,14 +232,13 @@ CoinsResult AvailableCoinsListUnspent(const CWallet& wallet, const CCoinControl*
CAmount GetAvailableBalance(const CWallet& wallet, const CCoinControl* coinControl)
{
LOCK(wallet.cs_wallet);
- return AvailableCoins(wallet,
- coinControl,
- std::nullopt, /*feerate=*/
- 1, /*nMinimumAmount*/
- MAX_MONEY, /*nMaximumAmount*/
- MAX_MONEY, /*nMinimumSumAmount*/
- 0 /*nMaximumCount*/
- ).total_amount;
+ return AvailableCoins(wallet, coinControl,
+ /*feerate=*/ std::nullopt,
+ /*nMinimumAmount=*/ 1,
+ /*nMaximumAmount=*/ MAX_MONEY,
+ /*nMinimumSumAmount=*/ MAX_MONEY,
+ /*nMaximumCount=*/ 0
+ ).total_amount;
}
const CTxOut& FindNonChangeParentOutput(const CWallet& wallet, const CTransaction& tx, int output)