diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-10-17 08:47:11 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-10-17 08:47:11 +0200 |
| commit | 494ff05a4cd9d89857342d5c843ed480afcc8fe7 (patch) | |
| tree | dbab4f9ea8dfe172b9766b3df0b7cb87ea908b53 /src/chainparamsbase.h | |
| parent | Merge pull request #5096 (diff) | |
| parent | squashme on 3fdb9e8c (Bluematt's bikeshedding) (diff) | |
| download | discoin-494ff05a4cd9d89857342d5c843ed480afcc8fe7.tar.xz discoin-494ff05a4cd9d89857342d5c843ed480afcc8fe7.zip | |
Merge pull request #4804 from jtimon/chainparams3
Remove CBaseChainParams::NetworkID()
Diffstat (limited to 'src/chainparamsbase.h')
| -rw-r--r-- | src/chainparamsbase.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index cc154cf50..911d1181a 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -26,7 +26,6 @@ public: const std::string& DataDir() const { return strDataDir; } int RPCPort() const { return nRPCPort; } - Network NetworkID() const { return networkID; } protected: CBaseChainParams() {} @@ -46,7 +45,13 @@ const CBaseChainParams& BaseParams(); void SelectBaseParams(CBaseChainParams::Network network); /** - * Looks for -regtest or -testnet 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(); |