Merge pull request zcash#5598

eb0d34b Remove unused chainparam networkID (jtimon)
dth88 · Jan 6, 2015 · de70dd4 · de70dd4
2 parents a89b837 + eb0d34b
commit de70dd4
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 10 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -101,7 +101,6 @@ static const Checkpoints::CCheckpointData dataRegtest = {
 class CMainParams : public CChainParams {
 public:
     CMainParams() {
-        networkID = CBaseChainParams::MAIN;
         strNetworkID = "main";
         /** 
          * The message start string is designed to be unlikely to occur in normal data.
@@ -189,7 +188,6 @@ static CMainParams mainParams;
 class CTestNetParams : public CMainParams {
 public:
     CTestNetParams() {
-        networkID = CBaseChainParams::TESTNET;
         strNetworkID = "test";
         pchMessageStart[0] = 0x0b;
         pchMessageStart[1] = 0x11;
@@ -246,7 +244,6 @@ static CTestNetParams testNetParams;
 class CRegTestParams : public CTestNetParams {
 public:
     CRegTestParams() {
-        networkID = CBaseChainParams::REGTEST;
         strNetworkID = "regtest";
         pchMessageStart[0] = 0xfa;
         pchMessageStart[1] = 0xbf;
@@ -291,7 +288,6 @@ static CRegTestParams regTestParams;
 class CUnitTestParams : public CMainParams, public CModifiableParams {
 public:
     CUnitTestParams() {
-        networkID = CBaseChainParams::UNITTEST;
         strNetworkID = "unittest";
         nDefaultPort = 18445;
         vFixedSeeds.clear(); //! Unit test mode doesn't have any fixed seeds.

diff --git a/src/chainparams.h b/src/chainparams.h
@@ -97,7 +97,6 @@ class CChainParams
     int nMinerThreads;
     std::vector<CDNSSeedData> vSeeds;
     std::vector<unsigned char> base58Prefixes[MAX_BASE58_TYPES];
-    CBaseChainParams::Network networkID;
     std::string strNetworkID;
     CBlock genesis;
     std::vector<CAddress> vFixedSeeds;

diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
@@ -21,7 +21,6 @@ class CBaseMainParams : public CBaseChainParams
 public:
     CBaseMainParams()
     {
-        networkID = CBaseChainParams::MAIN;
         nRPCPort = 8332;
     }
 };
@@ -35,7 +34,6 @@ class CBaseTestNetParams : public CBaseMainParams
 public:
     CBaseTestNetParams()
     {
-        networkID = CBaseChainParams::TESTNET;
         nRPCPort = 18332;
         strDataDir = "testnet3";
     }
@@ -50,7 +48,6 @@ class CBaseRegTestParams : public CBaseTestNetParams
 public:
     CBaseRegTestParams()
     {
-        networkID = CBaseChainParams::REGTEST;
         strDataDir = "regtest";
     }
 };
@@ -64,7 +61,6 @@ class CBaseUnitTestParams : public CBaseMainParams
 public:
     CBaseUnitTestParams()
     {
-        networkID = CBaseChainParams::UNITTEST;
         strDataDir = "unittest";
     }
 };

diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h
@@ -32,7 +32,6 @@ class CBaseChainParams
 
     int nRPCPort;
     std::string strDataDir;
-    Network networkID;
 };
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,6 @@ class CBaseChainParams @@
         int nRPCPort;
         std::string strDataDir;
-        Network networkID;
     };
     /**
@@ Expand Down @@