LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Remove CBaseChainParams::NetworkID()

Browse source
This commit is contained in:
jtimon 2014-09-01 00:41:28 +02:00
parent f297479a19
commit 3fdb9e8c15
3 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/chainparams.cpp
View file

@ -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;
}

27
src/chainparamsbase.cpp
View file

@ -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) {
return false;
}
if (fTestNet && fRegTest)
return MAX_NETWORK_TYPES;
if (fRegTest)
return REGTEST;
if (fTestNet)
return TESTNET;
return MAIN;
}
if (fRegTest) {
SelectBaseParams(CBaseChainParams::REGTEST);
} else if (fTestNet) {
SelectBaseParams(CBaseChainParams::TESTNET);
} else {
SelectBaseParams(CBaseChainParams::MAIN);
}
bool SelectBaseParamsFromCommandLine()
{
CBaseChainParams::Network network = CBaseChainParams::NetworkIdFromCommandLine();
if (network == CBaseChainParams::MAX_NETWORK_TYPES)
return false;
SelectBaseParams(network);
return true;
}

8
src/chainparamsbase.h
View file

@ -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();
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();