highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-26 05:48:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Chainparams: Translations: DRY: options and error strings

Browse Source 
Also remove SelectBaseParamsFromCommandLine and SelectParamsFromCommandLine
This commit is contained in:
Jorge Timón
2015-05-25 09:00:17 +02:00
parent f3525e24e3
commit 55a89751fa
9 changed files with 37 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/chainparamsbase.cpp
View File

@@ -13,7 +13,16 @@
const std::string CBaseChainParams::MAIN = "main";
const std::string CBaseChainParams::TESTNET = "test";
const std::string CBaseChainParams::REGTEST = "regtest";
const std::string CBaseChainParams::MAX_NETWORK_TYPES = "unknown_chain";
void AppendParamsHelpMessages(std::string& strUsage, bool debugHelp)
{
strUsage += HelpMessageGroup(_("Chain selection options:"));
strUsage += HelpMessageOpt("-testnet", _("Use the test chain"));
if (debugHelp) {
strUsage += HelpMessageOpt("-regtest", "Enter regression test mode, which uses a special chain in which blocks can be solved instantly. "
"This is intended for regression testing tools and app development.");
}
}
/**
* Main network
@@ -95,7 +104,7 @@ std::string ChainNameFromCommandLine()
bool fTestNet = GetBoolArg("-testnet", false);
if (fTestNet && fRegTest)
return CBaseChainParams::MAX_NETWORK_TYPES;
throw std::runtime_error("Invalid combination of -regtest and -testnet.");
if (fRegTest)
return CBaseChainParams::REGTEST;
if (fTestNet)
@@ -103,16 +112,6 @@ std::string ChainNameFromCommandLine()
return CBaseChainParams::MAIN;
}
bool SelectBaseParamsFromCommandLine()
{
std::string network = ChainNameFromCommandLine();
if (network == CBaseChainParams::MAX_NETWORK_TYPES)
return false;
SelectBaseParams(network);
return true;
}
bool AreBaseParamsConfigured()
{
return pCurrentBaseParams != NULL;