Use a proper factory for creating chainparams #8855

  71 | +    assert(globalChainBaseParams.get());
  72 | +    return *globalChainBaseParams;
  73 |  }
  74 |  
  75 | -CBaseChainParams& BaseParams(const std::string& chain)
  76 | +CBaseChainParams* CBaseChainParams::Factory(const std::string& chain)

---

  21 | @@ -22,6 +22,12 @@ class CBaseChainParams
  22 |  
  23 |      const std::string& DataDir() const { return strDataDir; }
  24 |      int RPCPort() const { return nRPCPort; }
  25 | +    /**
  26 | +     * Creates and returns a CBaseChainParams* of the chosen chain. The caller has to delete the object.
  27 | +     * @returns A CBaseChainParams* of the chosen chain.
  28 | +     * @throws a std::runtime_error if the chain is not supported.
  29 | +     */
  30 | +    static CBaseChainParams* Factory(const std::string& chain);

---

  31 | @@ -32,14 +32,16 @@ static const int CONTINUE_EXECUTION=-1;
  32 |  
  33 |  std::string HelpMessageCli()
  34 |  {
  35 | +    const std::unique_ptr<CBaseChainParams> defaultBaseParams(CBaseChainParams::Factory(CBaseChainParams::MAIN));

---

  78 | +    /**
  79 | +     * Creates and returns a CChainParams* of the chosen chain. The caller has to delete the object.
  80 | +     * @returns a CChainParams* of the chosen chain.
  81 | +     * @throws a std::runtime_error if the chain is not supported.
  82 | +     */
  83 | +    static std::unique_ptr<CChainParams> Factory(const std::string& chain);

---

 325 | +static std::unique_ptr<CChainParams> globalChainParams;
 326 |  
 327 |  const CChainParams &Params() {
 328 | -    assert(pCurrentParams);
 329 | -    return *pCurrentParams;
 330 | +    assert(globalChainParams.get());

---

   7 | @@ -8,8 +8,6 @@
   8 |  #include "tinyformat.h"
   9 |  #include "util.h"
  10 |  
  11 | -#include <assert.h>

---

  17 | @@ -18,69 +18,59 @@ BOOST_FIXTURE_TEST_SUITE(pow_tests, BasicTestingSetup)
  18 |  /* Test calculation of next difficulty target with no constraints applying */
  19 |  BOOST_AUTO_TEST_CASE(get_next_work)
  20 |  {
  21 | -    SelectParams(CBaseChainParams::MAIN);
  22 | -    const Consensus::Params& params = Params().GetConsensus();
  23 | -
  24 | +    auto chainParams = CreateChainParams(CBaseChainParams::MAIN);

---

  31 | @@ -31,6 +32,13 @@ class CBaseChainParams
  32 |  };
  33 |  
  34 |  /**
  35 | + * Creates and returns a CBaseChainParams* of the chosen chain. The caller has to delete the object.

---

1124 | @@ -1123,7 +1125,7 @@ bool AppInitParameterInteraction()
1125 |              for (int j=0; j<(int)Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++j)
1126 |              {
1127 |                  if (vDeploymentParams[0].compare(VersionBitsDeploymentInfo[j].name) == 0) {
1128 | -                    UpdateRegtestBIP9Parameters(Consensus::DeploymentPos(j), nStartTime, nTimeout);
1129 | +                    UpdateBIP9Parameters(Consensus::DeploymentPos(j), nStartTime, nTimeout);

---

 367 | +    throw std::runtime_error(strprintf("%s: Unknown chain %s.", __func__, chain));
 368 | +}
 369 | +
 370 | +const CChainParams& Params(const std::string& chain)
 371 | +{
 372 | +    globalSwitchingChainParams = CreateChainParams(chain);

---

  96 | @@ -95,6 +97,13 @@ class CChainParams
  97 |  };
  98 |  
  99 |  /**
 100 | + * Creates and returns a std::unique_ptr<CChainParams> of the chosen chain.
 101 | + * @returns a CChainParams* of the chosen chain.

---

  31 | @@ -31,6 +32,13 @@ class CBaseChainParams
  32 |  };
  33 |  
  34 |  /**
  35 | + * Creates and returns a std::unique_ptr<CBaseChainParams> of the chosen chain.
  36 | + * @returns a CBaseChainParams* of the chosen chain.

---