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

SQUASHME: NetworkIdFromCommandLine() function instead of method

Browse Source
This commit is contained in:
jtimon
2014-10-09 19:15:38 +02:00
parent 3fdb9e8c15
commit b796cb084b
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/chainparamsbase.cpp
View File

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