diff options
author | MarcoFalke <falke.marco@gmail.com> | 2020-09-24 15:11:27 +0200 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2020-09-29 10:20:05 +0200 |
commit | fa23308e9aad70c99a31f91d8556f1876ea02c04 (patch) | |
tree | b506f748bfb0d71bde4c34500abf0bc0455040b6 /src/chainparams.cpp | |
parent | e36aa351a31cde0f95ce957b2ff593a97f91eb6d (diff) | |
download | bitcoin-fa23308e9aad70c99a31f91d8556f1876ea02c04.tar.xz |
Remove gArgs global from CreateChainParams to aid testing
Diffstat (limited to 'src/chainparams.cpp')
-rw-r--r-- | src/chainparams.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index d7f7888ef3..fc16abbad0 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -485,16 +485,16 @@ const CChainParams &Params() { return *globalChainParams; } -std::unique_ptr<const CChainParams> CreateChainParams(const std::string& chain) +std::unique_ptr<const CChainParams> CreateChainParams(const ArgsManager& args, const std::string& chain) { if (chain == CBaseChainParams::MAIN) { return std::unique_ptr<CChainParams>(new CMainParams()); } else if (chain == CBaseChainParams::TESTNET) { return std::unique_ptr<CChainParams>(new CTestNetParams()); } else if (chain == CBaseChainParams::SIGNET) { - return std::unique_ptr<CChainParams>(new SigNetParams(gArgs)); + return std::unique_ptr<CChainParams>(new SigNetParams(args)); } else if (chain == CBaseChainParams::REGTEST) { - return std::unique_ptr<CChainParams>(new CRegTestParams(gArgs)); + return std::unique_ptr<CChainParams>(new CRegTestParams(args)); } throw std::runtime_error(strprintf("%s: Unknown chain %s.", __func__, chain)); } @@ -502,5 +502,5 @@ std::unique_ptr<const CChainParams> CreateChainParams(const std::string& chain) void SelectParams(const std::string& network) { SelectBaseParams(network); - globalChainParams = CreateChainParams(network); + globalChainParams = CreateChainParams(gArgs, network); } |