Browse Source

Merge pull request #4804 from jtimon/chainparams3

Remove CBaseChainParams::NetworkID()
pull/1/head
Wladimir J. van der Laan 8 years ago
parent
commit
494ff05a4c
  1. 9
      src/chainparams.cpp
  2. 25
      src/chainparamsbase.cpp
  3. 9
      src/chainparamsbase.h
  4. 12
      src/util.cpp

9
src/chainparams.cpp

@ -354,10 +354,13 @@ void SelectParams(CBaseChainParams::Network network) { @@ -354,10 +354,13 @@ void SelectParams(CBaseChainParams::Network network) {
pCurrentParams = &Params(network);
}
bool SelectParamsFromCommandLine() {
if (!SelectBaseParamsFromCommandLine())
bool SelectParamsFromCommandLine()
{
CBaseChainParams::Network network = NetworkIdFromCommandLine();
if (network == CBaseChainParams::MAX_NETWORK_TYPES)
return false;
SelectParams(BaseParams().NetworkID());
SelectBaseParams(network);
SelectParams(network);
return true;
}

25
src/chainparamsbase.cpp

@ -100,22 +100,27 @@ void SelectBaseParams(CBaseChainParams::Network network) @@ -100,22 +100,27 @@ void SelectBaseParams(CBaseChainParams::Network network)
}
}
bool SelectBaseParamsFromCommandLine()
CBaseChainParams::Network NetworkIdFromCommandLine()
{
bool fRegTest = GetBoolArg("-regtest", false);
bool fTestNet = GetBoolArg("-testnet", false);
if (fTestNet && fRegTest) {
if (fTestNet && fRegTest)
return CBaseChainParams::MAX_NETWORK_TYPES;
if (fRegTest)
return CBaseChainParams::REGTEST;
if (fTestNet)
return CBaseChainParams::TESTNET;
return CBaseChainParams::MAIN;
}
bool SelectBaseParamsFromCommandLine()
{
CBaseChainParams::Network network = 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;
}

9
src/chainparamsbase.h

@ -26,7 +26,6 @@ public: @@ -26,7 +26,6 @@ public:
const std::string& DataDir() const { return strDataDir; }
int RPCPort() const { return nRPCPort; }
Network NetworkID() const { return networkID; }
protected:
CBaseChainParams() {}
@ -46,7 +45,13 @@ const CBaseChainParams& BaseParams(); @@ -46,7 +45,13 @@ const CBaseChainParams& BaseParams();
void SelectBaseParams(CBaseChainParams::Network network);
/**
* Looks for -regtest or -testnet and then calls SelectParams as appropriate.
* Looks for -regtest or -testnet and returns the appropriate Network ID.
* Returns MAX_NETWORK_TYPES if an invalid combination is given.
*/
CBaseChainParams::Network NetworkIdFromCommandLine();
/**
* Calls NetworkIdFromCommandLine() and then calls SelectParams as appropriate.
* Returns false if an invalid combination is given.
*/
bool SelectBaseParamsFromCommandLine();

12
src/util.cpp

@ -395,7 +395,8 @@ boost::filesystem::path GetDefaultDataDir() @@ -395,7 +395,8 @@ boost::filesystem::path GetDefaultDataDir()
#endif
}
static boost::filesystem::path pathCached[CBaseChainParams::MAX_NETWORK_TYPES+1];
static boost::filesystem::path pathCached;
static boost::filesystem::path pathCachedNetSpecific;
static CCriticalSection csPathCached;
const boost::filesystem::path &GetDataDir(bool fNetSpecific)
@ -404,10 +405,7 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific) @@ -404,10 +405,7 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific)
LOCK(csPathCached);
int nNet = CBaseChainParams::MAX_NETWORK_TYPES;
if (fNetSpecific) nNet = BaseParams().NetworkID();
fs::path &path = pathCached[nNet];
fs::path &path = fNetSpecific ? pathCachedNetSpecific : pathCached;
// This can be called during exceptions by LogPrintf(), so we cache the
// value so we don't have to do memory allocations after that.
@ -433,8 +431,8 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific) @@ -433,8 +431,8 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific)
void ClearDatadirCache()
{
std::fill(&pathCached[0], &pathCached[CBaseChainParams::MAX_NETWORK_TYPES+1],
boost::filesystem::path());
pathCached = boost::filesystem::path();
pathCachedNetSpecific = boost::filesystem::path();
}
boost::filesystem::path GetConfigFile()

Loading…
Cancel
Save