Move ChainNameFromCommandLine into ArgsManager, rename to GetChainName

ajtowns · random-zebra · commit 0ab3e990b858 · 2021-04-19T23:49:03.000+02:00
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
@@ -87,17 +87,3 @@ void SelectBaseParams(const std::string& chain)
 {
     globalChainBaseParams = CreateBaseChainParams(chain);
 }
-
-std::string ChainNameFromCommandLine()
-{
-    bool fRegTest = gArgs.GetBoolArg("-regtest", false);
-    bool fTestNet = gArgs.GetBoolArg("-testnet", false);
-
-    if (fTestNet && fRegTest)
-        throw std::runtime_error("Invalid combination of -regtest and -testnet.");
-    if (fRegTest)
-        return CBaseChainParams::REGTEST;
-    if (fTestNet)
-        return CBaseChainParams::TESTNET;
-    return CBaseChainParams::MAIN;
-}
diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h
@@ -1,10 +1,10 @@
-// Copyright (c) 2014 The Bitcoin developers
-// Copyright (c) 2017-2020 The PIVX developers
+// Copyright (c) 2014-2021 The Bitcoin developers
+// Copyright (c) 2017-2021 The PIVX developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_CHAINPARAMSBASE_H
-#define BITCOIN_CHAINPARAMSBASE_H
+#ifndef PIVX_CHAINPARAMSBASE_H
+#define PIVX_CHAINPARAMSBASE_H
 
 #include <memory>
 #include <string>
@@ -62,4 +62,4 @@ void SelectBaseParams(const std::string& chain);
  */
 std::string ChainNameFromCommandLine();
 
-#endif // BITCOIN_CHAINPARAMSBASE_H
+#endif // PIVX_CHAINPARAMSBASE_H
diff --git a/src/pivx-cli.cpp b/src/pivx-cli.cpp
@@ -94,7 +94,7 @@ static bool AppInitRPC(int argc, char* argv[])
     }
     // Check for -testnet or -regtest parameter (BaseParams() calls are only valid after this clause)
     try {
-        SelectBaseParams(ChainNameFromCommandLine());
+        SelectBaseParams(gArgs.GetChainName());
     } catch(const std::exception& e) {
         fprintf(stderr, "Error: %s\n", e.what());
         return false;
diff --git a/src/pivx-tx.cpp b/src/pivx-tx.cpp
@@ -34,7 +34,7 @@ static bool AppInitRawTx(int argc, char* argv[])
 
     // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)
     try {
-        SelectParams(ChainNameFromCommandLine());
+        SelectParams(gArgs.GetChainName());
     } catch(const std::exception& e) {
         fprintf(stderr, "Error: %s\n", e.what());
         return false;
diff --git a/src/pivxd.cpp b/src/pivxd.cpp
@@ -89,7 +89,7 @@ bool AppInit(int argc, char* argv[])
         }
         // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)
         try {
-            SelectParams(ChainNameFromCommandLine());
+            SelectParams(gArgs.GetChainName());
         } catch(const std::exception& e) {
             fprintf(stderr, "Error: %s\n", e.what());
             return false;
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -630,9 +630,10 @@ bool DHMSTableWidgetItem::operator<(QTableWidgetItem const& item) const
 #ifdef WIN32
 fs::path static StartupShortcutPath()
 {
-    if (gArgs.GetBoolArg("-testnet", false))
+    std::string chain = gArgs.GetChainName();
+    if (chain == CBaseChainParams::TESTNET)
         return GetSpecialFolderPath(CSIDL_STARTUP) / "PIVX (testnet).lnk";
-    else if (gArgs.GetBoolArg("-regtest", false))
+    else if (chain == CBaseChainParams::REGTEST)
         return GetSpecialFolderPath(CSIDL_STARTUP) / "PIVX (regtest).lnk";
 
     return GetSpecialFolderPath(CSIDL_STARTUP) / "PIVX.lnk";
diff --git a/src/qt/pivx.cpp b/src/qt/pivx.cpp
@@ -623,7 +623,7 @@ int main(int argc, char* argv[])
 
     // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)
     try {
-        SelectParams(ChainNameFromCommandLine());
+        SelectParams(gArgs.GetChainName());
     } catch(const std::exception& e) {
         QMessageBox::critical(0, QObject::tr("PIVX Core"), QObject::tr("Error: %1").arg(e.what()));
         return 1;
diff --git a/src/util.cpp b/src/util.cpp
@@ -538,6 +538,20 @@ fs::path AbsPathForConfigVal(const fs::path& path, bool net_specific)
     return fs::absolute(path, GetDataDir(net_specific));
 }
 
+std::string ArgsManager::GetChainName() const
+{
+    bool fRegTest = GetBoolArg("-regtest", false);
+    bool fTestNet = GetBoolArg("-testnet", false);
+
+    if (fTestNet && fRegTest)
+        throw std::runtime_error("Invalid combination of -regtest and -testnet.");
+    if (fRegTest)
+        return CBaseChainParams::REGTEST;
+    if (fTestNet)
+        return CBaseChainParams::TESTNET;
+    return CBaseChainParams::MAIN;
+}
+
 #ifndef WIN32
 fs::path GetPidFile()
 {
diff --git a/src/util.h b/src/util.h
@@ -202,6 +202,12 @@ class ArgsManager
     // Forces a arg setting, used only in testing
     void ForceSetArg(const std::string& strArg, const std::string& strValue);
 
+    /**
+     * Looks for -regtest, -testnet and returns the appropriate BIP70 chain name.
+     * @return CBaseChainParams::MAIN by default; raises runtime error if an invalid combination is given.
+     */
+    std::string GetChainName() const;
+
 private:
 
     // Munge -nofoo into -foo=0 and track the value as negated.

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ static bool AppInitRPC(int argc, char* argv[])`
`94`	`94`	`}`
`95`	`95`	`// Check for -testnet or -regtest parameter (BaseParams() calls are only valid after this clause)`
`96`	`96`	`try {`
`97`		`- SelectBaseParams(ChainNameFromCommandLine());`
	`97`	`+ SelectBaseParams(gArgs.GetChainName());`
`98`	`98`	`} catch(const std::exception& e) {`
`99`	`99`	`fprintf(stderr, "Error: %s\n", e.what());`
`100`	`100`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ bool AppInit(int argc, char* argv[])`
`89`	`89`	`}`
`90`	`90`	`// Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)`
`91`	`91`	`try {`
`92`		`- SelectParams(ChainNameFromCommandLine());`
	`92`	`+ SelectParams(gArgs.GetChainName());`
`93`	`93`	`} catch(const std::exception& e) {`
`94`	`94`	`fprintf(stderr, "Error: %s\n", e.what());`
`95`	`95`	`return false;`