Remove CBaseChainParams::NetworkID()

src/chainparams.cpp

@@ -240,10 +240,13 @@ void SelectParams(CBaseChainParams::Network network) {
     pCurrentParams = &Params(network);
 }
 
-bool SelectParamsFromCommandLine() {
+bool SelectParamsFromCommandLine() 
-    if (!SelectBaseParamsFromCommandLine())
+{
+    CBaseChainParams::Network network = CBaseChainParams::NetworkIdFromCommandLine();
+    if (network == CBaseChainParams::MAX_NETWORK_TYPES)
         return false;
 
-    SelectParams(BaseParams().NetworkID());
+    SelectBaseParams(network);
+    SelectParams(network);
     return true;
 }

src/chainparamsbase.cpp

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

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();