From 8826b6bdc4b83bd53e72a76bf57bcb73d461fdba Mon Sep 17 00:00:00 2001
From: Jannis Froese <s9jafroe@stud.uni-saarland.de>
Date: Mon, 2 Jun 2014 21:31:23 +0200
Subject: [PATCH] Make rewards in regtest mode less random

This allows sane testing. Regtest mode is primarily intended for automated
testing, so this simplification makes sense
---
 src/chainparams.cpp | 1 +
 src/chainparams.h   | 1 +
 src/main.cpp        | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 0a40e59e9..8672c6130 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -262,6 +262,7 @@ public:
     }
 
     virtual bool RequireRPCPassword() const { return false; }
+    virtual bool SimplifiedRewards() const { return true; }
     virtual Network NetworkID() const { return CChainParams::REGTEST; }
 };
 static CRegTestParams regTestParams;
diff --git a/src/chainparams.h b/src/chainparams.h
index 542afeaf9..314306e13 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -60,6 +60,7 @@ public:
     int SubsidyHalvingInterval() const { return nSubsidyHalvingInterval; }
     virtual const CBlock& GenesisBlock() const = 0;
     virtual bool RequireRPCPassword() const { return true; }
+    virtual bool SimplifiedRewards() const { return false; }
     const string& DataDir() const { return strDataDir; }
     virtual Network NetworkID() const = 0;
     const vector<CDNSSeedData>& DNSSeeds() const { return vSeeds; }
diff --git a/src/main.cpp b/src/main.cpp
index 072675fdf..809fc759a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1196,11 +1196,11 @@ int64_t GetBlockValue(int nHeight, int64_t nFees, uint256 prevHash)
     int rand = generateMTRandom(seed, 999999);
     int rand1 = 0;
 
-    if(nHeight < 100000)
+    if(nHeight < 100000 && !Params().SimplifiedRewards())
     {
         nSubsidy = (1 + rand) * COIN;
     }
-    else if(nHeight < 145000)
+    else if(nHeight < 145000 && !Params().SimplifiedRewards())
     {
         cseed_str = prevHash.ToString().substr(7,7);
         cseed = cseed_str.c_str();