aboutsummaryrefslogtreecommitdiff
path: root/src/amount.cpp
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2016-03-09 12:54:55 +0100
committerMarcoFalke <falke.marco@gmail.com>2016-03-17 17:00:45 +0100
commitfaf756ae4ed63a31f073c09f3d0f25c13971cb98 (patch)
tree39d6d41cbaed35d85872b5135c19be913bf7dee5 /src/amount.cpp
parentfab688049402a111b32df6ca0765d3bcbb2d6ab5 (diff)
[amount] Make GetFee() monotonic
This reverts the hard-to-read and buggy code introduced in d88af560111863c3e9c1ae855dcc287f04dffb02 and adds documentation
Diffstat (limited to 'src/amount.cpp')
-rw-r--r--src/amount.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/amount.cpp b/src/amount.cpp
index a3abd8cd83..d03ed5cfad 100644
--- a/src/amount.cpp
+++ b/src/amount.cpp
@@ -19,10 +19,10 @@ CFeeRate::CFeeRate(const CAmount& nFeePaid, size_t nSize)
CAmount CFeeRate::GetFee(size_t nSize) const
{
- CAmount nFee = nSatoshisPerK*nSize / 1000;
+ CAmount nFee = nSatoshisPerK * nSize / 1000;
- if (nFee == 0 && nSatoshisPerK > 0)
- nFee = nSatoshisPerK;
+ if (nFee == 0 && nSize != 0 && nSatoshisPerK != 0)
+ nFee = CAmount(1);
return nFee;
}