From dffc025d38bb12b655bfde53de6dd237840c7d8e Mon Sep 17 00:00:00 2001
From: syd <sydo@protonmail.com>
Date: Thu, 23 Nov 2017 12:20:50 -0500
Subject: [PATCH] Get rid of consensus.fPowAllowMinDifficultyBlocks.

This closes #1380
---
 src/chainparams.cpp    | 2 --
 src/consensus/params.h | 1 -
 src/miner.cpp          | 9 ---------
 3 files changed, 12 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 16c5e9d24a7..034eee6b2b3 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -49,7 +49,6 @@ class CMainParams : public CChainParams {
         consensus.nPowMaxAdjustDown = 32; // 32% adjustment down
         consensus.nPowMaxAdjustUp = 16; // 16% adjustment up
         consensus.nPowTargetSpacing = 2.5 * 60;
-        consensus.fPowAllowMinDifficultyBlocks = false;
         /**
          * The message start string should be awesome! ⓩ❤
          */
@@ -211,7 +210,6 @@ class CTestNetParams : public CMainParams {
         consensus.nMajorityWindow = 400;
         consensus.powLimit = uint256S("07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
         assert(maxUint/UintToArith256(consensus.powLimit) >= consensus.nPowAveragingWindow);
-        consensus.fPowAllowMinDifficultyBlocks = true;
         pchMessageStart[0] = 0xfa;
         pchMessageStart[1] = 0x1a;
         pchMessageStart[2] = 0xf9;
diff --git a/src/consensus/params.h b/src/consensus/params.h
index d3e6462b8e3..c74e66d5fa4 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -41,7 +41,6 @@ struct Params {
     int nMajorityWindow;
     /** Proof of work parameters */
     uint256 powLimit;
-    bool fPowAllowMinDifficultyBlocks;
     int64_t nPowAveragingWindow;
     int64_t nPowMaxAdjustDown;
     int64_t nPowMaxAdjustUp;
diff --git a/src/miner.cpp b/src/miner.cpp
index 3434a0d7c79..327228f3f6e 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -100,10 +100,6 @@ class TxPriorityCompare
 void UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev)
 {
     pblock->nTime = std::max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
-
-    // Updating time can change work required on testnet:
-    if (consensusParams.fPowAllowMinDifficultyBlocks)
-        pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, consensusParams);
 }
 
 CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
@@ -714,11 +710,6 @@ void static BitcoinMiner()
                 // Update nNonce and nTime
                 pblock->nNonce = ArithToUint256(UintToArith256(pblock->nNonce) + 1);
                 UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);
-                if (chainparams.GetConsensus().fPowAllowMinDifficultyBlocks)
-                {
-                    // Changing pblock->nTime can change work required on testnet:
-                    hashTarget.SetCompact(pblock->nBits);
-                }
             }
         }
     }