From b1aa5e04e1833edc068353bbf0d95e783ea8bcdd Mon Sep 17 00:00:00 2001
From: Brannon King <countprimes@gmail.com>
Date: Wed, 10 Jul 2019 08:34:21 -0600
Subject: [PATCH] revert regtest expiration change
---
src/chainparams.cpp | 2 +-
src/test/claimtriebranching_tests.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 764208714..1442e783d 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -361,7 +361,7 @@ public:
consensus.nPowTargetSpacing = 1;
consensus.nOriginalClaimExpirationTime = 500;
consensus.nExtendedClaimExpirationTime = 600;
- consensus.nExtendedClaimExpirationForkHeight = 8000;
+ consensus.nExtendedClaimExpirationForkHeight = 800;
consensus.nAllowMinDiffMinHeight = -1;
consensus.nAllowMinDiffMaxHeight = -1;
consensus.nNormalizedNameForkHeight = 250; // SDK depends upon this number
diff --git a/src/test/claimtriebranching_tests.cpp b/src/test/claimtriebranching_tests.cpp
index d3ceb7f26..bb8738fb9 100644
--- a/src/test/claimtriebranching_tests.cpp
+++ b/src/test/claimtriebranching_tests.cpp
@@ -498,7 +498,7 @@ BOOST_AUTO_TEST_CASE(triehash_fuzzer_test)
}
if (blocks == 1000 && claimsPerBlock == 100)
- BOOST_CHECK_EQUAL(fixture.getMerkleHash().GetHex(), "c5df693adbe6b386a5d1e494e83a8f5745f32f6917a32b4f429e7c20b47171dd");
+ BOOST_CHECK_EQUAL(fixture.getMerkleHash().GetHex(), "21b25760f8e0f3e95514ff90b8ef3758b270e50fe17f747ba29f99dd1874bf41");
else if (blocks == 13 && claimsPerBlock == 100)
BOOST_CHECK_EQUAL(fixture.getMerkleHash().GetHex(), "4e5984d6984f5f05d50e821e6228d56bcfbd16ca2093cd0308f6ff1c2bc8689a");
else