Browse Source

Remove CBaseChainParams::NetworkID()

pull/1/head
jtimon 8 years ago
parent
commit
3fdb9e8c15
  1. 9
      src/chainparams.cpp
  2. 25
      src/chainparamsbase.cpp
  3. 8
      src/chainparamsbase.h

9
src/chainparams.cpp

@ -240,10 +240,13 @@ void SelectParams(CBaseChainParams::Network network) { @@ -240,10 +240,13 @@ void SelectParams(CBaseChainParams::Network network) {
pCurrentParams = &Params(network);
}
bool SelectParamsFromCommandLine() {
if (!SelectBaseParamsFromCommandLine())
bool SelectParamsFromCommandLine()
{
CBaseChainParams::Network network = CBaseChainParams::NetworkIdFromCommandLine();
if (network == CBaseChainParams::MAX_NETWORK_TYPES)
return false;
SelectParams(BaseParams().NetworkID());
SelectBaseParams(network);
SelectParams(network);
return true;
}

25
src/chainparamsbase.cpp

@ -83,22 +83,27 @@ void SelectBaseParams(CBaseChainParams::Network network) @@ -83,22 +83,27 @@ void SelectBaseParams(CBaseChainParams::Network network)
}
}
bool SelectBaseParamsFromCommandLine()
CBaseChainParams::Network CBaseChainParams::NetworkIdFromCommandLine()
{
bool fRegTest = GetBoolArg("-regtest", false);
bool fTestNet = GetBoolArg("-testnet", false);
if (fTestNet && fRegTest) {
if (fTestNet && fRegTest)
return MAX_NETWORK_TYPES;
if (fRegTest)
return REGTEST;
if (fTestNet)
return TESTNET;
return MAIN;
}
bool SelectBaseParamsFromCommandLine()
{
CBaseChainParams::Network network = CBaseChainParams::NetworkIdFromCommandLine();
if (network == CBaseChainParams::MAX_NETWORK_TYPES)
return false;
}
if (fRegTest) {
SelectBaseParams(CBaseChainParams::REGTEST);
} else if (fTestNet) {
SelectBaseParams(CBaseChainParams::TESTNET);
} else {
SelectBaseParams(CBaseChainParams::MAIN);
}
SelectBaseParams(network);
return true;
}

8
src/chainparamsbase.h

@ -25,8 +25,12 @@ public: @@ -25,8 +25,12 @@ public:
const std::string& DataDir() const { return strDataDir; }
int RPCPort() const { return nRPCPort; }
Network NetworkID() const { return networkID; }
/**
* Looks for -regtest or -testnet and returns the appropriate Network ID.
* Returns MAX_NETWORK_TYPES if an invalid combination is given.
*/
static Network NetworkIdFromCommandLine();
protected:
CBaseChainParams() {}
@ -45,7 +49,7 @@ const CBaseChainParams& BaseParams(); @@ -45,7 +49,7 @@ const CBaseChainParams& BaseParams();
void SelectBaseParams(CBaseChainParams::Network network);
/**
* Looks for -regtest or -testnet and then calls SelectParams as appropriate.
* Calls CBaseChainParams::NetworkIdFromCommandLine() and then calls SelectParams as appropriate.
* Returns false if an invalid combination is given.
*/
bool SelectBaseParamsFromCommandLine();

Loading…
Cancel
Save