diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-09-30 16:18:57 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-09-30 17:00:19 +0200 |
| commit | 3487e421a7fef4b28381efcf21a7e38483946cec (patch) | |
| tree | f9fb02d8ac0c5122f4a56a376604d608622425cc /src/chainparams.cpp | |
| parent | 72affcb16cad45bd9e08ca163b2147fd01b84b70 (diff) | |
| parent | fa29b5ae666bbb4c19188f0dcf8a1ba738aac624 (diff) | |
| download | bitcoin-3487e421a7fef4b28381efcf21a7e38483946cec.tar.xz | |
Merge #20004: test: Add signet witness commitment section parse tests
fa29b5ae666bbb4c19188f0dcf8a1ba738aac624 test: Add signet witness commitment section parse tests (MarcoFalke)
fa23308e9aad70c99a31f91d8556f1876ea02c04 Remove gArgs global from CreateChainParams to aid testing (MarcoFalke)
Pull request description:
ACKs for top commit:
laanwj:
ACK fa29b5ae666bbb4c19188f0dcf8a1ba738aac624
Tree-SHA512: f956407d690decbfb8178bcb8f101d107389fecc3aa7be515f7b0f5ceac26d798c165100f7ddf08cec569beabcc6514862dda23b667cc4fd0a784316784735c2
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 59bce33168..931c2b5297 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -495,16 +495,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)); } @@ -512,5 +512,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); } |