From fa23308e9aad70c99a31f91d8556f1876ea02c04 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Thu, 24 Sep 2020 15:11:27 +0200 Subject: Remove gArgs global from CreateChainParams to aid testing --- src/chainparams.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/chainparams.cpp') 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 CreateChainParams(const std::string& chain) +std::unique_ptr CreateChainParams(const ArgsManager& args, const std::string& chain) { if (chain == CBaseChainParams::MAIN) { return std::unique_ptr(new CMainParams()); } else if (chain == CBaseChainParams::TESTNET) { return std::unique_ptr(new CTestNetParams()); } else if (chain == CBaseChainParams::SIGNET) { - return std::unique_ptr(new SigNetParams(gArgs)); + return std::unique_ptr(new SigNetParams(args)); } else if (chain == CBaseChainParams::REGTEST) { - return std::unique_ptr(new CRegTestParams(gArgs)); + return std::unique_ptr(new CRegTestParams(args)); } throw std::runtime_error(strprintf("%s: Unknown chain %s.", __func__, chain)); } @@ -502,5 +502,5 @@ std::unique_ptr CreateChainParams(const std::string& chain) void SelectParams(const std::string& network) { SelectBaseParams(network); - globalChainParams = CreateChainParams(network); + globalChainParams = CreateChainParams(gArgs, network); } -- cgit v1.2.3