diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-05-22 08:14:17 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-05-22 08:14:25 +0200 |
| commit | a4ca0b042365061020627a8c045cddacea3312ec (patch) | |
| tree | 294e66d6460b5c2ad61e1088aed4352d7c879265 | |
| parent | 6b99dafe4204e8e86091e6dab6271e9d8aedfba7 (diff) | |
| parent | 43c587738db298036ec27a7a7ccc1c17662c3f13 (diff) | |
| download | bitcoin-a4ca0b042365061020627a8c045cddacea3312ec.tar.xz | |
Merge #10431: Prevent shadowing the global dustRelayFee
43c5877 Prevent shadowing the global dustRelayFee. (Pavel JanÃk)
Tree-SHA512: 9765931a7753c484990003396afd0bb65a53f42d1cad9502017720618ce90b3c5ae68591db01e3524adecdbe6925a5eeeebf04012ba644ef3b65073af207ae5d
| -rw-r--r-- | src/policy/policy.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index 2b19a6714b..f4fffd6578 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -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)); } /** |