diff options
| author | Jannis Froese <[email protected]> | 2014-06-02 21:31:23 +0200 |
|---|---|---|
| committer | Jannis Froese <[email protected]> | 2014-06-02 21:51:04 +0200 |
| commit | 8826b6bdc4b83bd53e72a76bf57bcb73d461fdba (patch) | |
| tree | 521a1f87012b5c1679c34c377494eeebd5eac19b /src/main.cpp | |
| parent | fix regtest mining in internal miner (diff) | |
| download | archived-discoin-8826b6bdc4b83bd53e72a76bf57bcb73d461fdba.tar.xz archived-discoin-8826b6bdc4b83bd53e72a76bf57bcb73d461fdba.zip | |
Make rewards in regtest mode less random
This allows sane testing. Regtest mode is primarily intended for automated
testing, so this simplification makes sense
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |