Skip to content

Remove CHAINPARAMS_ELEMENTS #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtimon merged 1 commit into from
Nov 28, 2017
Merged

Remove CHAINPARAMS_ELEMENTS #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/chainparams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class CElementsParams : public CChainParams {
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");
Expand Down Expand Up @@ -397,7 +397,6 @@ class CCustomParams : public CChainParams {

const std::vector<std::string> CChainParams::supportedChains =
boost::assign::list_of
( CHAINPARAMS_ELEMENTS )
( CHAINPARAMS_REGTEST )
;

Expand All @@ -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) {
Expand Down
22 changes: 3 additions & 19 deletions src/chainparamsbase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
Expand All @@ -39,20 +39,6 @@ class CBaseMainParams : public CBaseChainParams
}
};

/**
* Main network for elements
*/
class CBaseElementsParams : public CBaseChainParams
{
public:
CBaseElementsParams()
{
nRPCPort = 9041;
nMainchainRPCPort = 18332;
strDataDir = CHAINPARAMS_ELEMENTS;
}
};

/**
* Regression test
*/
Expand Down Expand Up @@ -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)
Expand All @@ -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 change: 0 additions & 1 deletion src/chainparamsbase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include <vector>

#define CHAINPARAMS_OLD_MAIN "main"
#define CHAINPARAMS_ELEMENTS "elements"
#define CHAINPARAMS_REGTEST "elementsregtest"

/**
Expand Down
1 change: 0 additions & 1 deletion src/rpc/protocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down