aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-01-06 18:12:51 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2015-01-06 18:12:58 +0100
commitde70dd4904aef3884612bf1410c63543a7adca80 (patch)
treebd6f740c341f5c4e7e8ea53b67a9d5c472a03c34
parenta89b8371d6243242c2bb75a6005e7b4584ea6e6d (diff)
parenteb0d34b494e36af01d4636c69e6570943fb30f1c (diff)
Merge pull request #5598
eb0d34b Remove unused chainparam networkID (jtimon)
-rw-r--r--src/chainparams.cpp4
-rw-r--r--src/chainparams.h1
-rw-r--r--src/chainparamsbase.cpp4
-rw-r--r--src/chainparamsbase.h1
4 files changed, 0 insertions, 10 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 3abc569dcd..32100f4777 100644
--- 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
index f1ef6a11f1..f52bf4e55f 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -97,7 +97,6 @@ protected:
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
index e45536ce71..61c8f5021e 100644
--- 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
index 24db9b2840..cebe7aa01a 100644
--- a/src/chainparamsbase.h
+++ b/src/chainparamsbase.h
@@ -32,7 +32,6 @@ protected:
int nRPCPort;
std::string strDataDir;
- Network networkID;
};
/**