From eb0d34b494e36af01d4636c69e6570943fb30f1c Mon Sep 17 00:00:00 2001 From: jtimon Date: Thu, 6 Nov 2014 17:59:46 +0100 Subject: [PATCH] Remove unused chainparam networkID --- src/chainparams.cpp | 4 ---- src/chainparams.h | 1 - src/chainparamsbase.cpp | 4 ---- src/chainparamsbase.h | 1 - 4 files changed, 10 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 8a6a061ea1..51ae0a35bc 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. @@ -190,7 +189,6 @@ static CMainParams mainParams; class CTestNetParams : public CMainParams { public: CTestNetParams() { - networkID = CBaseChainParams::TESTNET; strNetworkID = "test"; pchMessageStart[0] = 0x0b; pchMessageStart[1] = 0x11; @@ -247,7 +245,6 @@ static CTestNetParams testNetParams; class CRegTestParams : public CTestNetParams { public: CRegTestParams() { - networkID = CBaseChainParams::REGTEST; strNetworkID = "regtest"; pchMessageStart[0] = 0xfa; pchMessageStart[1] = 0xbf; @@ -292,7 +289,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 5d1ee1d3c6..c5268356cc 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -97,7 +97,6 @@ protected: int nMinerThreads; std::vector vSeeds; std::vector base58Prefixes[MAX_BASE58_TYPES]; - CBaseChainParams::Network networkID; std::string strNetworkID; CBlock genesis; std::vector vFixedSeeds; diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index 8646a31603..40a7eacb93 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 eaf3fea1b6..1e5895a631 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -32,7 +32,6 @@ protected: int nRPCPort; std::string strDataDir; - Network networkID; }; /**