highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 06:28:31 +01:00
Code Issues Packages Projects Releases 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
Download Patch File Download Diff File Expand all files Collapse all files

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