Make RegTest use simplified rewards for easier test vector setup and …

…use short block times

src/chainparams.cpp

@@ -285,17 +285,19 @@ class CRegTestParams : public CTestNetParams {
         consensus.nMajorityRejectBlockOutdated = 950;
         consensus.nMajorityWindow = 1000;
         consensus.nPowTargetTimespan = 4 * 60 * 60; // pre-digishield: 4 hours
+        consensus.nPowTargetSpacing = 1; // regtest: 1 second blocks
         consensus.powLimit = uint256S("0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 1;
         consensus.fStrictChainId = true;
         consensus.fAllowLegacyBlocks = false; // Never allow legacy blocks on RegTest
+        consensus.fSimplifiedRewards = true;
 
         // Reset links before we copy parameters
         consensus.pLeft = NULL;
         consensus.pRight = NULL;
 
         digishieldConsensus = consensus;
         digishieldConsensus.nHeightEffective = 10;
-        digishieldConsensus.nPowTargetTimespan = 60; // post-digishield: 1 minute
+        digishieldConsensus.nPowTargetTimespan = 1; // // regtest: also retarget every second in digishield mode, for conformity
         digishieldConsensus.fDigishieldDifficultyCalculation = true;
 
         auxpowConsensus = digishieldConsensus;