GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Chainparams: Unify CRegTestParams and CCustomParams

Browse source 
bitcoin-backport-12128: One CBaseChainParams should be enough
This commit is contained in:
Jorge Timón 2018-02-19 07:40:27 +01:00
parent 3a55ca6f25
commit b553501cb2
No known key found for this signature in database
GPG key ID: 8866C18EA1C944A2
5 changed files with 51 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/chainparamsbase.cpp
View file

@ -12,7 +12,6 @@
const std::string CBaseChainParams::MAIN = CHAINPARAMS_OLD_MAIN;
const std::string CBaseChainParams::REGTEST = CHAINPARAMS_REGTEST;
const std::string CBaseChainParams::CUSTOM = "custom";
void AppendParamsHelpMessages(std::string& strUsage, bool debugHelp)
{
@ -26,44 +25,6 @@ void AppendParamsHelpMessages(std::string& strUsage, bool debugHelp)
}
}
/**
* Old Main network
*/
class CBaseMainParams : public CBaseChainParams
{
public:
CBaseMainParams()
{
nRPCPort = 8332;
strDataDir = CHAINPARAMS_OLD_MAIN;
}
};
/**
* Regression test
*/
class CBaseRegTestParams : public CBaseChainParams
{
public:
CBaseRegTestParams()
{
nRPCPort = 7041;
nMainchainRPCPort = 18332;
strDataDir = CHAINPARAMS_REGTEST;
}
};
/** Custom tests */
class CBaseCustomParams : public CBaseChainParams
{
public:
CBaseCustomParams()
{
nRPCPort = 18332;
strDataDir = "custom";
}
};
static std::unique_ptr<CBaseChainParams> globalChainBaseParams;
const CBaseChainParams& BaseParams()
@ -75,13 +36,8 @@ const CBaseChainParams& BaseParams()
std::unique_ptr<CBaseChainParams> CreateBaseChainParams(const std::string& chain)
{
if (chain == CBaseChainParams::MAIN)
return std::unique_ptr<CBaseChainParams>(new CBaseMainParams());
else if (chain == CBaseChainParams::REGTEST)
return std::unique_ptr<CBaseChainParams>(new CBaseRegTestParams());
else if (chain == CBaseChainParams::CUSTOM)
return std::unique_ptr<CBaseChainParams>(new CBaseCustomParams());
else
throw std::runtime_error(strprintf("%s: Unknown chain %s.", __func__, chain));
return std::unique_ptr<CBaseChainParams>(new CBaseChainParams(chain, 8332, 18332));
return std::unique_ptr<CBaseChainParams>(new CBaseChainParams(chain, 7041, 18332));
}
void SelectBaseParams(const std::string& chain)