From 3fdb9e8c159a2bc3ac853b469dae9ba0ecf739f3 Mon Sep 17 00:00:00 2001
From: jtimon <jtimon@blockstream.io>
Date: Mon, 1 Sep 2014 00:41:28 +0200
Subject: Remove CBaseChainParams::NetworkID()

---
 src/chainparamsbase.cpp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'src/chainparamsbase.cpp')

diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
index 98bb5b855..05ef5dd46 100644
--- a/src/chainparamsbase.cpp
+++ b/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 MAX_NETWORK_TYPES;
+    if (fRegTest)
+        return REGTEST;
+    if (fTestNet)
+        return TESTNET;
+    return MAIN;
+}
+
+bool SelectBaseParamsFromCommandLine() 
+{
+    CBaseChainParams::Network network = CBaseChainParams::NetworkIdFromCommandLine();
+    if (network == CBaseChainParams::MAX_NETWORK_TYPES)
         return false;
-    }
 
-    if (fRegTest) {
-        SelectBaseParams(CBaseChainParams::REGTEST);
-    } else if (fTestNet) {
-        SelectBaseParams(CBaseChainParams::TESTNET);
-    } else {
-        SelectBaseParams(CBaseChainParams::MAIN);
-    }
+    SelectBaseParams(network);
     return true;
 }
 
-- 
cgit v1.2.3


From b796cb084bd3865d094d86da2f33cd5c68294a43 Mon Sep 17 00:00:00 2001
From: jtimon <jtimon@blockstream.io>
Date: Thu, 9 Oct 2014 19:15:38 +0200
Subject: SQUASHME: NetworkIdFromCommandLine() function instead of method

---
 src/chainparamsbase.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/chainparamsbase.cpp')

diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
index 05ef5dd46..f275bd544 100644
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -83,23 +83,23 @@ void SelectBaseParams(CBaseChainParams::Network network)
     }
 }
 
-CBaseChainParams::Network CBaseChainParams::NetworkIdFromCommandLine()
+CBaseChainParams::Network NetworkIdFromCommandLine()
 {
     bool fRegTest = GetBoolArg("-regtest", false);
     bool fTestNet = GetBoolArg("-testnet", false);
 
     if (fTestNet && fRegTest)
-        return MAX_NETWORK_TYPES;
+        return CBaseChainParams::MAX_NETWORK_TYPES;
     if (fRegTest)
-        return REGTEST;
+        return CBaseChainParams::REGTEST;
     if (fTestNet)
-        return TESTNET;
-    return MAIN;
+        return CBaseChainParams::TESTNET;
+    return CBaseChainParams::MAIN;
 }
 
 bool SelectBaseParamsFromCommandLine() 
 {
-    CBaseChainParams::Network network = CBaseChainParams::NetworkIdFromCommandLine();
+    CBaseChainParams::Network network = NetworkIdFromCommandLine();
     if (network == CBaseChainParams::MAX_NETWORK_TYPES)
         return false;
 
-- 
cgit v1.2.3


From ca3ce0fa037a94f2c357ad04d42e5f526cbcb78e Mon Sep 17 00:00:00 2001
From: jtimon <jtimon@blockstream.io>
Date: Thu, 16 Oct 2014 22:49:33 +0200
Subject: squashme on 3fdb9e8c (Bluematt's bikeshedding)

---
 src/chainparamsbase.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/chainparamsbase.cpp')

diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
index f275bd544..a602d8e30 100644
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -97,7 +97,7 @@ CBaseChainParams::Network NetworkIdFromCommandLine()
     return CBaseChainParams::MAIN;
 }
 
-bool SelectBaseParamsFromCommandLine() 
+bool SelectBaseParamsFromCommandLine()
 {
     CBaseChainParams::Network network = NetworkIdFromCommandLine();
     if (network == CBaseChainParams::MAX_NETWORK_TYPES)
-- 
cgit v1.2.3