f'Chainparams: Unify CRegTestParams and CCustomParams'

jtimon · jtimon · commit 6be1e7062821 · 2018-02-21T01:11:42.000+01:00
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -208,7 +208,7 @@ class CCustomParams : public CChainParams {
  */
 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<CChainParams> CreateChainParams(const std::string& chain)
 {
     if (chain == CBaseChainParams::MAIN)
-        return std::unique_ptr<CChainParams>(new CMainParams());
+        return std::unique_ptr<CChainParams>(new CMainParams(chain));
     return std::unique_ptr<CChainParams>(new CCustomParams(chain));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ class CCustomParams : public CChainParams {`
`208`	`208`	`*/`
`209`	`209`	`class CMainParams : public CCustomParams {`
`210`	`210`	`public:`
`211`		`- CMainParams() : CCustomParams(CHAINPARAMS_OLD_MAIN)`
	`211`	`+ CMainParams(const std::string& chain) : CCustomParams(chain)`
`212`	`212`	`{`
`213`	`213`	`consensus.nRuleChangeActivationThreshold = 1916; // 95% of 2016`
`214`	`214`	`consensus.nMinerConfirmationWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing`
`@@ -243,7 +243,7 @@ const CChainParams &Params() {`
`243`	`243`	`std::unique_ptr<CChainParams> CreateChainParams(const std::string& chain)`
`244`	`244`	`{`
`245`	`245`	`if (chain == CBaseChainParams::MAIN)`
`246`		`- return std::unique_ptr<CChainParams>(new CMainParams());`
	`246`	`+ return std::unique_ptr<CChainParams>(new CMainParams(chain));`
`247`	`247`	`return std::unique_ptr<CChainParams>(new CCustomParams(chain));`
`248`	`248`	`}`
`249`	`249`