LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #5598

Browse source 
eb0d34b Remove unused chainparam networkID (jtimon)
This commit is contained in:
Wladimir J. van der Laan 2015-01-06 18:12:51 +01:00
commit de70dd4904
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
4 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/chainparams.cpp
View file

@ -101,7 +101,6 @@ static const Checkpoints::CCheckpointData dataRegtest = {
class CMainParams : public CChainParams { class CMainParams : public CChainParams {
public: public:
CMainParams() { CMainParams() {
networkID = CBaseChainParams::MAIN;
strNetworkID = "main"; strNetworkID = "main";
/** /**
* The message start string is designed to be unlikely to occur in normal data. * 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 { class CTestNetParams : public CMainParams {
public: public:
CTestNetParams() { CTestNetParams() {
networkID = CBaseChainParams::TESTNET;
strNetworkID = "test"; strNetworkID = "test";
pchMessageStart[0] = 0x0b; pchMessageStart[0] = 0x0b;
pchMessageStart[1] = 0x11; pchMessageStart[1] = 0x11;
@ -246,7 +244,6 @@ static CTestNetParams testNetParams;
class CRegTestParams : public CTestNetParams { class CRegTestParams : public CTestNetParams {
public: public:
CRegTestParams() { CRegTestParams() {
networkID = CBaseChainParams::REGTEST;
strNetworkID = "regtest"; strNetworkID = "regtest";
pchMessageStart[0] = 0xfa; pchMessageStart[0] = 0xfa;
pchMessageStart[1] = 0xbf; pchMessageStart[1] = 0xbf;
@ -291,7 +288,6 @@ static CRegTestParams regTestParams;
class CUnitTestParams : public CMainParams, public CModifiableParams { class CUnitTestParams : public CMainParams, public CModifiableParams {
public: public:
CUnitTestParams() { CUnitTestParams() {
networkID = CBaseChainParams::UNITTEST;
strNetworkID = "unittest"; strNetworkID = "unittest";
nDefaultPort = 18445; nDefaultPort = 18445;
vFixedSeeds.clear(); //! Unit test mode doesn't have any fixed seeds. vFixedSeeds.clear(); //! Unit test mode doesn't have any fixed seeds.

1
src/chainparams.h
View file

@ -97,7 +97,6 @@ protected:
int nMinerThreads; int nMinerThreads;
std::vector<CDNSSeedData> vSeeds; std::vector<CDNSSeedData> vSeeds;
std::vector<unsigned char> base58Prefixes[MAX_BASE58_TYPES]; std::vector<unsigned char> base58Prefixes[MAX_BASE58_TYPES];
CBaseChainParams::Network networkID;
std::string strNetworkID; std::string strNetworkID;
CBlock genesis; CBlock genesis;
std::vector<CAddress> vFixedSeeds; std::vector<CAddress> vFixedSeeds;

4
src/chainparamsbase.cpp
View file

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

1
src/chainparamsbase.h
View file

@ -32,7 +32,6 @@ protected:
int nRPCPort; int nRPCPort;
std::string strDataDir; std::string strDataDir;
Network networkID;
}; };
/** /**