Chainparams: Refactor: Remove redundant AllowMinDifficultyBlocks() getter #5998

pull jtimon wants to merge 1 commits into bitcoin:master from jtimon:params_mindiff changing 4 files +15 −14

jtimon commented at 6:45 PM on April 10, 2015: contributor

A small part of #5970.

in src/miner.h:None in d1032bc08c outdated

   5 | @@ -6,6 +6,7 @@
   6 |  #ifndef BITCOIN_MINER_H
   7 |  #define BITCOIN_MINER_H
   8 |  
   9 | +#include "consensus/params.h"
  10 |  #include "primitives/block.h"

theuni commented at 6:59 PM on April 10, 2015:

Forward-declare instead?

theuni commented at 7:00 PM on April 10, 2015: member

ut ACK other than the nit.
sipa commented at 8:34 AM on April 11, 2015: member

ut ACK
jtimon force-pushed on Apr 12, 2015
jtimon force-pushed on Apr 14, 2015
jtimon commented at 1:05 PM on April 14, 2015: contributor

nit (forward declaration of Consensus::Params) fixed

in src/miner.h:None in bce7b6ef60 outdated

  29 | @@ -29,6 +30,6 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn);
  30 |  CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey);
  31 |  /** Modify the extranonce in a block */
  32 |  void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce);
  33 | -void UpdateTime(CBlockHeader* block, const CBlockIndex* pindexPrev);
  34 | +void UpdateTime(CBlockHeader*, const Consensus::Params&, const CBlockIndex*);

laanwj commented at 9:13 AM on April 15, 2015:

I don't agree on removing the argument names here, they serve as a kind of documentation.

laanwj commented at 10:15 AM on April 15, 2015: member

utACK apart from above nit
jtimon force-pushed on Apr 15, 2015
Chainparams: Refactor: Remove redundant AllowMinDifficultyBlocks() getter bebe7282ff
jtimon force-pushed on Apr 15, 2015
jtimon commented at 12:33 PM on April 15, 2015: contributor

Fixed @laanwj 's nit (do not remove the parameter names of the functions in the header file).
in src/miner.h:None in bebe7282ff
```
  13 | @@ -14,6 +14,7 @@ class CBlockIndex;
  14 |  class CReserveKey;
  15 |  class CScript;
  16 |  class CWallet;
  17 | +namespace Consensus { class Params; };
```
Diapolo commented at 12:51 PM on April 15, 2015:

Nit: If you mind add a new-line here, but that's not meant to be of any interrest if this is going to get merged now :).
laanwj merged this on Apr 15, 2015
laanwj closed this on Apr 15, 2015
laanwj referenced this in commit 9ab7cbffce on Apr 15, 2015
MarcoFalke locked this on Sep 8, 2021

Contributors

Linked (view graph)

#5970 DEPENDENT: Globals: Avoid calling Params()