GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Chainparams: Remove CHAINPARAMS_ELEMENTS

Browse source
This commit is contained in:
Jorge Timón 2017-09-21 07:27:07 +02:00
parent 81f986b014
commit 3866795457
No known key found for this signature in database
GPG key ID: 8866C18EA1C944A2
4 changed files with 4 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/chainparams.cpp
View file

@ -117,7 +117,7 @@ public:
defaultFedpegScript = CScript() << OP_2 << ParseHex("02d51090b27ca8f1cc04984614bd749d8bab6f2a3681318d3fd0dd43b2a39dd774") << ParseHex("03a75bd7ac458b19f98047c76a6ffa442e592148c5d23a1ec82d379d5d558f4fd8") << ParseHex("034c55bede1bce8e486080f8ebb7a0e8f106b49efb295a8314da0e1b1723738c66") << OP_3 << OP_CHECKMULTISIG;
consensus.fedpegScript = StrHexToScriptWithDefault(GetArg("-fedpegscript", ""), defaultFedpegScript);
strNetworkID = CHAINPARAMS_ELEMENTS;
strNetworkID = CHAINPARAMS_OLD_MAIN;
consensus.nSubsidyHalvingInterval = 210000;
consensus.BIP34Height = 227931;
consensus.BIP34Hash = uint256S("0x000000000000024b89b42a942fe0d9fea3bb44ab7bd1b19115dd6a759c0808b8");
@ -397,7 +397,6 @@ public:
const std::vector<std::string> CChainParams::supportedChains =
boost::assign::list_of
( CHAINPARAMS_ELEMENTS )
( CHAINPARAMS_REGTEST )
;
@ -412,8 +411,6 @@ std::unique_ptr<CChainParams> CreateChainParams(const std::string& chain)
{
if (chain == CBaseChainParams::MAIN)
return std::unique_ptr<CChainParams>(new CMainParams());
else if (chain == CHAINPARAMS_ELEMENTS)
return std::unique_ptr<CChainParams>(new CElementsParams());
else if (chain == CBaseChainParams::REGTEST)
return std::unique_ptr<CChainParams>(new CRegTestParams());
else if (chain == CBaseChainParams::CUSTOM) {

22
src/chainparamsbase.cpp
View file

@ -17,7 +17,7 @@ const std::string CBaseChainParams::CUSTOM = "custom";
void AppendParamsHelpMessages(std::string& strUsage, bool debugHelp)
{
strUsage += HelpMessageGroup(_("Chain selection options:"));
strUsage += HelpMessageOpt("-chain=<chain>", strprintf(_("Use the chain <chain> (default: %s). Allowed values: main, testnet, regtest, custom"), CHAINPARAMS_ELEMENTS));
strUsage += HelpMessageOpt("-chain=<chain>", strprintf(_("Use the chain <chain> (default: %s). Allowed values: main, testnet, regtest, custom"), CHAINPARAMS_OLD_MAIN));
if (debugHelp) {
strUsage += HelpMessageOpt("-regtest", "Enter regression test mode, which uses a special chain in which blocks can be solved instantly. "
"This is intended for regression testing tools and app development.");
@ -39,20 +39,6 @@ public:
}
};
/**
* Main network for elements
*/
class CBaseElementsParams : public CBaseChainParams
{
public:
CBaseElementsParams()
{
nRPCPort = 9041;
nMainchainRPCPort = 18332;
strDataDir = CHAINPARAMS_ELEMENTS;
}
};
/**
* Regression test
*/
@ -90,8 +76,6 @@ std::unique_ptr<CBaseChainParams> CreateBaseChainParams(const std::string& chain
{
if (chain == CBaseChainParams::MAIN)
return std::unique_ptr<CBaseChainParams>(new CBaseMainParams());
else if (chain == CHAINPARAMS_ELEMENTS)
return std::unique_ptr<CBaseChainParams>(new CBaseElementsParams());
else if (chain == CBaseChainParams::REGTEST)
return std::unique_ptr<CBaseChainParams>(new CBaseRegTestParams());
else if (chain == CBaseChainParams::CUSTOM)
@ -108,8 +92,8 @@ void SelectBaseParams(const std::string& chain)
std::string ChainNameFromCommandLine()
{
if (GetBoolArg("-testnet", false))
throw std::runtime_error(strprintf("%s: Invalid option -testnet: elements/%s is a testchain too.", __func__, CHAINPARAMS_ELEMENTS));
throw std::runtime_error(strprintf("%s: Invalid option -testnet: try -chain=%s instead.", __func__, CHAINPARAMS_REGTEST));
if (GetBoolArg("-regtest", false))
return CBaseChainParams::REGTEST;
return GetArg("-chain", CHAINPARAMS_ELEMENTS);
return GetArg("-chain", CHAINPARAMS_REGTEST);
}

1
src/chainparamsbase.h
View file

@ -10,7 +10,6 @@
#include <vector>
#define CHAINPARAMS_OLD_MAIN "main"
#define CHAINPARAMS_ELEMENTS "elements"
#define CHAINPARAMS_REGTEST "elementsregtest"
/**

1
src/rpc/protocol.cpp
View file

@ -79,7 +79,6 @@ boost::filesystem::path GetAuthCookieFile()
boost::filesystem::path GetMainchainAuthCookieFile()
{
boost::filesystem::path path(GetArg("-mainchainrpccookiefile", COOKIEAUTH_FILE));
if (!path.is_complete() && BaseParams().DataDir() == CHAINPARAMS_ELEMENTS) path = "testnet3" / path;
if (!path.is_complete() && BaseParams().DataDir() == CHAINPARAMS_REGTEST) path = "regtest" / path;
if (!path.is_complete()) path = GetDataDir(false) / path;
return path;