diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-12-02 14:38:17 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-12-02 14:38:43 +0100 |
| commit | df2ced5c8325b84557f185b687e6c014de84cecf (patch) | |
| tree | 62921ce38e6aef6f230a750ca9ef59339e7b6a68 /src/chainparamsbase.cpp | |
| parent | qt: Final translation update before 0.12 fork (diff) | |
| parent | Constrain rpcport default values to a single location in code (diff) | |
| download | discoin-df2ced5c8325b84557f185b687e6c014de84cecf.tar.xz discoin-df2ced5c8325b84557f185b687e6c014de84cecf.zip | |
Merge pull request #7128
02354c9 Constrain rpcport default values to a single location in code (Luke Dashjr)
Diffstat (limited to 'src/chainparamsbase.cpp')
| -rw-r--r-- | src/chainparamsbase.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index db2dc751f..aa973abf7 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -86,18 +86,23 @@ const CBaseChainParams& BaseParams() return *pCurrentBaseParams; } -void SelectBaseParams(const std::string& chain) +CBaseChainParams& BaseParams(const std::string& chain) { if (chain == CBaseChainParams::MAIN) - pCurrentBaseParams = &mainParams; + return mainParams; else if (chain == CBaseChainParams::TESTNET) - pCurrentBaseParams = &testNetParams; + return testNetParams; else if (chain == CBaseChainParams::REGTEST) - pCurrentBaseParams = ®TestParams; + return regTestParams; else throw std::runtime_error(strprintf("%s: Unknown chain %s.", __func__, chain)); } +void SelectBaseParams(const std::string& chain) +{ + pCurrentBaseParams = &BaseParams(chain); +} + std::string ChainNameFromCommandLine() { bool fRegTest = GetBoolArg("-regtest", false); |