Skip to content

Commit 8e7eeb5

Browse files
author
MacroFake
committed
Merge bitcoin/bitcoin#25410: wallet: fix warning: "argument name 'feerate' in comment does not match parameter name"
7ca8726 wallet: fix warning: "argument name 'feerate' in comment does not match parameter name" (furszy) Pull request description: Should solve the tiny bitcoin/bitcoin#25005 (comment). Which merely happens for the extra "=" character after the comma. ACKs for top commit: Empact: Code Review ACK bitcoin/bitcoin@7ca8726 Tree-SHA512: e5368c1114f715bd93cb653c607fd0942ab0b79f709ed7aa627b3fc7e7efd096c92c5c86908c7f26c363b21e391a8faa812727eb32c285e54da3ce0429290361
2 parents 8be652e + 7ca8726 commit 8e7eeb5

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

src/wallet/spend.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,14 +232,13 @@ CoinsResult AvailableCoinsListUnspent(const CWallet& wallet, const CCoinControl*
232232
CAmount GetAvailableBalance(const CWallet& wallet, const CCoinControl* coinControl)
233233
{
234234
LOCK(wallet.cs_wallet);
235-
return AvailableCoins(wallet,
236-
coinControl,
237-
std::nullopt, /*feerate=*/
238-
1, /*nMinimumAmount*/
239-
MAX_MONEY, /*nMaximumAmount*/
240-
MAX_MONEY, /*nMinimumSumAmount*/
241-
0 /*nMaximumCount*/
242-
).total_amount;
235+
return AvailableCoins(wallet, coinControl,
236+
/*feerate=*/ std::nullopt,
237+
/*nMinimumAmount=*/ 1,
238+
/*nMaximumAmount=*/ MAX_MONEY,
239+
/*nMinimumSumAmount=*/ MAX_MONEY,
240+
/*nMaximumCount=*/ 0
241+
).total_amount;
243242
}
244243

245244
const CTxOut& FindNonChangeParentOutput(const CWallet& wallet, const CTransaction& tx, int output)

0 commit comments

Comments
 (0)