diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -24,9 +24,11 @@ const std::string &DataDir() const { return strDataDir; } int RPCPort() const { return nRPCPort; } -protected: - CBaseChainParams() {} + CBaseChainParams() = delete; + CBaseChainParams(const std::string &data_dir, int rpc_port) + : nRPCPort(rpc_port), strDataDir(data_dir) {} +private: int nRPCPort; std::string strDataDir; }; diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -24,36 +24,6 @@ OptionsCategory::CHAINPARAMS); } -/** - * Main network - */ -class CBaseMainParams : public CBaseChainParams { -public: - CBaseMainParams() { nRPCPort = 8332; } -}; - -/** - * Testnet (v3) - */ -class CBaseTestNetParams : public CBaseChainParams { -public: - CBaseTestNetParams() { - nRPCPort = 18332; - strDataDir = "testnet3"; - } -}; - -/* - * Regression test - */ -class CBaseRegTestParams : public CBaseChainParams { -public: - CBaseRegTestParams() { - nRPCPort = 18443; - strDataDir = "regtest"; - } -}; - static std::unique_ptr globalChainBaseParams; const CBaseChainParams &BaseParams() { @@ -64,11 +34,11 @@ std::unique_ptr CreateBaseChainParams(const std::string &chain) { if (chain == CBaseChainParams::MAIN) - return std::unique_ptr(new CBaseMainParams()); + return std::make_unique("", 8332); else if (chain == CBaseChainParams::TESTNET) - return std::unique_ptr(new CBaseTestNetParams()); + return std::make_unique("testnet3", 18332); else if (chain == CBaseChainParams::REGTEST) - return std::unique_ptr(new CBaseRegTestParams()); + return std::make_unique("regtest", 18443); else throw std::runtime_error( strprintf("%s: Unknown chain %s.", __func__, chain));