[Refactor] Implement CBaseChainParams::BaseParams(Network)

PIVX-Project · Aug 23, 2020 · a45275a · a45275a
1 parent 09abb98
commit a45275a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
@@ -64,24 +64,26 @@ const CBaseChainParams& BaseParams()
     return *pCurrentBaseParams;
 }
 
-void SelectBaseParams(CBaseChainParams::Network network)
+CBaseChainParams& BaseParams(CBaseChainParams::Network network)
 {
     switch (network) {
     case CBaseChainParams::MAIN:
-        pCurrentBaseParams = &mainParams;
-        break;
+        return mainParams;
     case CBaseChainParams::TESTNET:
-        pCurrentBaseParams = &testNetParams;
-        break;
+        return testNetParams;
     case CBaseChainParams::REGTEST:
-        pCurrentBaseParams = &regTestParams;
-        break;
+        return regTestParams;
     default:
         assert(false && "Unimplemented network");
-        return;
+        return mainParams;
     }
 }
 
+void SelectBaseParams(CBaseChainParams::Network network)
+{
+    pCurrentBaseParams = &BaseParams(network);
+}
+
 CBaseChainParams::Network NetworkIdFromCommandLine()
 {
     bool fRegTest = GetBoolArg("-regtest", false);

diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h
@@ -41,6 +41,11 @@ class CBaseChainParams
  */
 const CBaseChainParams& BaseParams();
 
+/**
+ * Return parameters for the given network.
+ */
+CBaseChainParams& BaseParams(CBaseChainParams::Network network);
+
 /** Sets the params returned by Params() to those for the given network. */
 void SelectBaseParams(CBaseChainParams::Network network);