Merge #10431: Prevent shadowing the global dustRelayFee
43c5877
Prevent shadowing the global dustRelayFee. (Pavel Janík)
Tree-SHA512: 9765931a7753c484990003396afd0bb65a53f42d1cad9502017720618ce90b3c5ae68591db01e3524adecdbe6925a5eeeebf04012ba644ef3b65073af207ae5d
This commit is contained in:
commit
a4ca0b0423
1 changed files with 4 additions and 4 deletions
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include <boost/foreach.hpp>
|
||||
|
||||
CAmount GetDustThreshold(const CTxOut& txout, const CFeeRate& dustRelayFee)
|
||||
CAmount GetDustThreshold(const CTxOut& txout, const CFeeRate& dustRelayFeeIn)
|
||||
{
|
||||
// "Dust" is defined in terms of dustRelayFee,
|
||||
// which has units satoshis-per-kilobyte.
|
||||
|
@ -44,12 +44,12 @@ CAmount GetDustThreshold(const CTxOut& txout, const CFeeRate& dustRelayFee)
|
|||
nSize += (32 + 4 + 1 + 107 + 4); // the 148 mentioned above
|
||||
}
|
||||
|
||||
return 3 * dustRelayFee.GetFee(nSize);
|
||||
return 3 * dustRelayFeeIn.GetFee(nSize);
|
||||
}
|
||||
|
||||
bool IsDust(const CTxOut& txout, const CFeeRate& dustRelayFee)
|
||||
bool IsDust(const CTxOut& txout, const CFeeRate& dustRelayFeeIn)
|
||||
{
|
||||
return (txout.nValue < GetDustThreshold(txout, dustRelayFee));
|
||||
return (txout.nValue < GetDustThreshold(txout, dustRelayFeeIn));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Reference in a new issue