Merge #12568: Allow dustrelayfee to be set to zero

laanwj · laanwj · commit ed6ae8059cdb · 2018-03-05T22:37:47.000+01:00
874e818 Allow dustrelayfee to be set to zero (Luke Dashjr) Pull request description: I don't see and can't think of any rationale for forbidding this configuration. Tree-SHA512: df09441f4aec63e79bea94838b7f8e336cebaeb0a22b5e58d27937bbeb1377f229921aeae43674e0b63fc40a39ae51a264d48aa1cdb4cbd0e3339d32856698bf
diff --git a/src/init.cpp b/src/init.cpp
@@ -1083,7 +1083,7 @@ bool AppInitParameterInteraction()
     if (gArgs.IsArgSet("-dustrelayfee"))
     {
         CAmount n = 0;
-        if (!ParseMoney(gArgs.GetArg("-dustrelayfee", ""), n) || 0 == n)
+        if (!ParseMoney(gArgs.GetArg("-dustrelayfee", ""), n))
             return InitError(AmountErrMsg("dustrelayfee", gArgs.GetArg("-dustrelayfee", "")));
         dustRelayFee = CFeeRate(n);
     }

Original file line number	Diff line number	Diff line change
`@@ -1083,7 +1083,7 @@ bool AppInitParameterInteraction()`
`1083`	`1083`	`if (gArgs.IsArgSet("-dustrelayfee"))`
`1084`	`1084`	`{`
`1085`	`1085`	`CAmount n = 0;`
`1086`		`- if (!ParseMoney(gArgs.GetArg("-dustrelayfee", ""), n) \|\| 0 == n)`
	`1086`	`+ if (!ParseMoney(gArgs.GetArg("-dustrelayfee", ""), n))`
`1087`	`1087`	`return InitError(AmountErrMsg("dustrelayfee", gArgs.GetArg("-dustrelayfee", "")));`
`1088`	`1088`	`dustRelayFee = CFeeRate(n);`
`1089`	`1089`	`}`