From 6be1e7062821e29d45fb807ab5829cde24b71e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= Date: Wed, 21 Feb 2018 01:11:42 +0100 Subject: [PATCH] f'Chainparams: Unify CRegTestParams and CCustomParams' --- src/chainparams.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 10026d25c6..4d5b2a25e3 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -208,7 +208,7 @@ public: */ class CMainParams : public CCustomParams { public: - CMainParams() : CCustomParams(CHAINPARAMS_OLD_MAIN) + CMainParams(const std::string& chain) : CCustomParams(chain) { consensus.nRuleChangeActivationThreshold = 1916; // 95% of 2016 consensus.nMinerConfirmationWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing @@ -243,7 +243,7 @@ const CChainParams &Params() { std::unique_ptr CreateChainParams(const std::string& chain) { if (chain == CBaseChainParams::MAIN) - return std::unique_ptr(new CMainParams()); + return std::unique_ptr(new CMainParams(chain)); return std::unique_ptr(new CCustomParams(chain)); }