aboutsummaryrefslogtreecommitdiff
path: root/src/chainparamsbase.cpp
diff options
context:
space:
mode:
authorjtimon <jtimon@blockstream.io>2014-10-09 19:15:38 +0200
committerjtimon <jtimon@blockstream.io>2014-10-10 12:05:20 +0200
commitb796cb084bd3865d094d86da2f33cd5c68294a43 (patch)
tree41ade1a991db35b37d753a79010e655cf67ed85c /src/chainparamsbase.cpp
parent3fdb9e8c159a2bc3ac853b469dae9ba0ecf739f3 (diff)
downloadbitcoin-b796cb084bd3865d094d86da2f33cd5c68294a43.tar.xz
SQUASHME: NetworkIdFromCommandLine() function instead of method
Diffstat (limited to 'src/chainparamsbase.cpp')
-rw-r--r--src/chainparamsbase.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
index 05ef5dd463..f275bd544f 100644
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -83,23 +83,23 @@ void SelectBaseParams(CBaseChainParams::Network network)
}
}
-CBaseChainParams::Network CBaseChainParams::NetworkIdFromCommandLine()
+CBaseChainParams::Network NetworkIdFromCommandLine()
{
bool fRegTest = GetBoolArg("-regtest", false);
bool fTestNet = GetBoolArg("-testnet", false);
if (fTestNet && fRegTest)
- return MAX_NETWORK_TYPES;
+ return CBaseChainParams::MAX_NETWORK_TYPES;
if (fRegTest)
- return REGTEST;
+ return CBaseChainParams::REGTEST;
if (fTestNet)
- return TESTNET;
- return MAIN;
+ return CBaseChainParams::TESTNET;
+ return CBaseChainParams::MAIN;
}
bool SelectBaseParamsFromCommandLine()
{
- CBaseChainParams::Network network = CBaseChainParams::NetworkIdFromCommandLine();
+ CBaseChainParams::Network network = NetworkIdFromCommandLine();
if (network == CBaseChainParams::MAX_NETWORK_TYPES)
return false;