diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-04-23 17:32:29 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-06-18 14:48:11 -0400 |
commit | fa613ca0a8f99c4771859de9e571878530d3ecb5 (patch) | |
tree | 93adc9e4d8274e3b6fa8055973e2206d9c9d695e /src | |
parent | 6c9d3c704f38600c68f897b1dff3ce19c1620be4 (diff) | |
download | bitcoin-fa613ca0a8f99c4771859de9e571878530d3ecb5.tar.xz |
chainparams: Remove unused fMineBlocksOnDemand
It is equal to consensus.fPowNoRetargeting
Diffstat (limited to 'src')
-rw-r--r-- | src/chainparams.cpp | 3 | ||||
-rw-r--r-- | src/chainparams.h | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index b8e0ea23dd..5c0d75fca6 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -141,7 +141,6 @@ public: fDefaultConsistencyChecks = false; fRequireStandard = true; - fMineBlocksOnDemand = false; checkpointData = { { @@ -247,7 +246,6 @@ public: fDefaultConsistencyChecks = false; fRequireStandard = false; - fMineBlocksOnDemand = false; checkpointData = { @@ -325,7 +323,6 @@ public: fDefaultConsistencyChecks = true; fRequireStandard = false; - fMineBlocksOnDemand = true; checkpointData = { { diff --git a/src/chainparams.h b/src/chainparams.h index 6ff3dbb7e5..efca8d184b 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -71,8 +71,8 @@ public: uint64_t AssumedBlockchainSize() const { return m_assumed_blockchain_size; } /** Minimum free space (in GB) needed for data directory when pruned; Does not include prune target*/ uint64_t AssumedChainStateSize() const { return m_assumed_chain_state_size; } - /** Make miner stop after a block is found. In RPC, don't return until nGenProcLimit blocks are generated */ - bool MineBlocksOnDemand() const { return fMineBlocksOnDemand; } + /** Whether it is possible to mine blocks on demand (no retargeting) */ + bool MineBlocksOnDemand() const { return consensus.fPowNoRetargeting; } /** Return the BIP70 network string (main, test or regtest) */ std::string NetworkIDString() const { return strNetworkID; } /** Return true if the fallback fee is by default enabled for this network */ @@ -101,7 +101,6 @@ protected: std::vector<SeedSpec6> vFixedSeeds; bool fDefaultConsistencyChecks; bool fRequireStandard; - bool fMineBlocksOnDemand; CCheckpointData checkpointData; ChainTxData chainTxData; bool m_fallback_fee_enabled; |