mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#25410: wallet: fix warning: "argument name 'feerate' in comment does not match parameter name"

Browse Source 
7ca8726f63 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
This commit is contained in:
MacroFake committed 2022-06-18 18:10:17 +02:00
2 parents 8be652e439 7ca8726f63
commit 8e7eeb5971
1 file changed
+7 -8
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/spend.cpp
+7 -8
View File
@@ -232,14 +232,13 @@ CoinsResult AvailableCoinsListUnspent(const CWallet& wallet, const CCoinControl*
CAmount GetAvailableBalance(const CWallet& wallet, const CCoinControl* coinControl) CAmount GetAvailableBalance(const CWallet& wallet, const CCoinControl* coinControl)
{ {
LOCK(wallet.cs_wallet); LOCK(wallet.cs_wallet);
return AvailableCoins(wallet, return AvailableCoins(wallet, coinControl,
coinControl, /*feerate=*/ std::nullopt,
std::nullopt, /*feerate=*/ /*nMinimumAmount=*/ 1,
1, /*nMinimumAmount*/ /*nMaximumAmount=*/ MAX_MONEY,
MAX_MONEY, /*nMaximumAmount*/ /*nMinimumSumAmount=*/ MAX_MONEY,
MAX_MONEY, /*nMinimumSumAmount*/ /*nMaximumCount=*/ 0
0 /*nMaximumCount*/ ).total_amount;
).total_amount;
} }
const CTxOut& FindNonChangeParentOutput(const CWallet& wallet, const CTransaction& tx, int output) const CTxOut& FindNonChangeParentOutput(const CWallet& wallet, const CTransaction& tx, int output)