highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 06:58:57 +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

13
src/chainparamsbase.h
View File

@@ -26,11 +26,6 @@ public:
const std::string& DataDir() const { return strDataDir; }
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:
CBaseChainParams() {}
@@ -49,7 +44,13 @@ const CBaseChainParams& BaseParams();
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.
*/
bool SelectBaseParamsFromCommandLine();