aboutsummaryrefslogtreecommitdiff
path: root/src/chainparamsbase.h
diff options
context:
space:
mode:
authorjtimon <jtimon@blockstream.io>2014-09-01 00:41:28 +0200
committerjtimon <jtimon@blockstream.io>2014-09-21 21:25:15 +0200
commit3fdb9e8c159a2bc3ac853b469dae9ba0ecf739f3 (patch)
treed4780d7151553c06d7fc4666465dcc5c02dbf409 /src/chainparamsbase.h
parentf297479a1995bd147c21c58fca103cd3ab3e54c1 (diff)
downloadbitcoin-3fdb9e8c159a2bc3ac853b469dae9ba0ecf739f3.tar.xz
Remove CBaseChainParams::NetworkID()
Diffstat (limited to 'src/chainparamsbase.h')
-rw-r--r--src/chainparamsbase.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h
index c054f03f17..f24337cef0 100644
--- a/src/chainparamsbase.h
+++ b/src/chainparamsbase.h
@@ -25,8 +25,12 @@ public:
const std::string& DataDir() const { return strDataDir; }
int RPCPort() const { return nRPCPort; }
- Network NetworkID() const { return networkID; }
+ /**
+ * 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() {}
@@ -45,7 +49,7 @@ const CBaseChainParams& BaseParams();
void SelectBaseParams(CBaseChainParams::Network network);
/**
- * Looks for -regtest or -testnet and then calls SelectParams as appropriate.
+ * Calls CBaseChainParams::NetworkIdFromCommandLine() and then calls SelectParams as appropriate.
* Returns false if an invalid combination is given.
*/
bool SelectBaseParamsFromCommandLine();