phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 23:09:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/chainparams.cpp
View file

@ -242,7 +242,7 @@ void SelectParams(CBaseChainParams::Network network) {
bool SelectParamsFromCommandLine() bool SelectParamsFromCommandLine()
{ {
CBaseChainParams::Network network = CBaseChainParams::NetworkIdFromCommandLine(); CBaseChainParams::Network network = NetworkIdFromCommandLine();
if (network == CBaseChainParams::MAX_NETWORK_TYPES) if (network == CBaseChainParams::MAX_NETWORK_TYPES)
return false; return false;

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 fRegTest = GetBoolArg("-regtest", false);
bool fTestNet = GetBoolArg("-testnet", false); bool fTestNet = GetBoolArg("-testnet", false);
if (fTestNet && fRegTest) if (fTestNet && fRegTest)
return MAX_NETWORK_TYPES; return CBaseChainParams::MAX_NETWORK_TYPES;
if (fRegTest) if (fRegTest)
return REGTEST; return CBaseChainParams::REGTEST;
if (fTestNet) if (fTestNet)
return TESTNET; return CBaseChainParams::TESTNET;
return MAIN; return CBaseChainParams::MAIN;
} }
bool SelectBaseParamsFromCommandLine() bool SelectBaseParamsFromCommandLine()
{ {
CBaseChainParams::Network network = CBaseChainParams::NetworkIdFromCommandLine(); CBaseChainParams::Network network = NetworkIdFromCommandLine();
if (network == CBaseChainParams::MAX_NETWORK_TYPES) if (network == CBaseChainParams::MAX_NETWORK_TYPES)
return false; return false;

13
src/chainparamsbase.h
View file

@ -26,11 +26,6 @@ public:
const std::string& DataDir() const { return strDataDir; } const std::string& DataDir() const { return strDataDir; }
int RPCPort() const { return nRPCPort; } int RPCPort() const { return nRPCPort; }
/**
* 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: protected:
CBaseChainParams() {} CBaseChainParams() {}
@ -49,7 +44,13 @@ const CBaseChainParams& BaseParams();
void SelectBaseParams(CBaseChainParams::Network network); void SelectBaseParams(CBaseChainParams::Network network);
/** /**
* Calls CBaseChainParams::NetworkIdFromCommandLine() and then calls SelectParams as appropriate. * Looks for -regtest or -testnet and returns the appropriate Network ID.
* Returns MAX_NETWORK_TYPES if an invalid combination is given.
*/
CBaseChainParams::Network NetworkIdFromCommandLine();
/**
* Calls NetworkIdFromCommandLine() and then calls SelectParams as appropriate.
* Returns false if an invalid combination is given. * Returns false if an invalid combination is given.
*/ */
bool SelectBaseParamsFromCommandLine(); bool SelectBaseParamsFromCommandLine();