miner: Default to DEFAULT_BLOCK_MIN_TX_FEE if unable to parse -blockm…

…intxfee
ElementsProject · Nov 5, 2018 · 7c5bc2a · 7c5bc2a
1 parent 6b8d0a2
commit 7c5bc2a
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -70,9 +70,8 @@ static BlockAssembler::Options DefaultOptions()
  // If -blockmaxweight is not given, limit to DEFAULT_BLOCK_MAX_WEIGHT
  BlockAssembler::Options options;
  options.nBlockMaxWeight = gArgs.GetArg("-blockmaxweight", DEFAULT_BLOCK_MAX_WEIGHT);
- if (gArgs.IsArgSet("-blockmintxfee")) {
- CAmount n = 0;
- ParseMoney(gArgs.GetArg("-blockmintxfee", ""), n);
+ CAmount n = 0;
+ if (gArgs.IsArgSet("-blockmintxfee") && ParseMoney(gArgs.GetArg("-blockmintxfee", ""), n)) {
  options.blockMinFeeRate = CFeeRate(n);
  } else {
  options.blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE);