Remove Founders' Reward override from #1398

2016-10-26 20:34:33 -07:00
parent 9f15b823ac
commit 2f5d62fe32
3 changed files with 0 additions and 18 deletions
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -398,14 +398,6 @@ std::string CChainParams::GetFoundersRewardAddressAtHeight(int nHeight) const {
 CScript CChainParams::GetFoundersRewardScriptAtHeight(int nHeight) const {
    assert(nHeight > 0 && nHeight <= consensus.GetLastFoundersRewardBlockHeight());

-    // #1398 START
-    // We can remove this code when miner_tests no longer expect this script
-    if (fMinerTestModeForFoundersRewardScript) {
-        auto rewardScript = ParseHex("a9146708e6670db0b950dac68031025cc5b63213a49187");
-        return CScript(rewardScript.begin(), rewardScript.end());
-    }
-    // #1398 END
-
    CBitcoinAddress address(GetFoundersRewardAddressAtHeight(nHeight).c_str());
    assert(address.IsValid());
    assert(address.IsScript());