f'Chainparams: Unify CRegTestParams and CCustomParams'

This commit is contained in:
Jorge Timón 2018-02-21 01:11:42 +01:00
parent c6ef55b23a
commit 6be1e70628
No known key found for this signature in database
GPG key ID: 8866C18EA1C944A2

View file

@ -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<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));
}