Move masternodeconfig initialization to tiertwo/init

furszy · furszy · commit 083fcad8c7eb · 2022-01-31T07:27:59.000-03:00
diff --git a/src/pivxd.cpp b/src/pivxd.cpp
@@ -92,13 +92,6 @@ bool AppInit(int argc, char* argv[])
             return false;
         }
 
-        // parse masternode.conf
-        std::string strErr;
-        if (!masternodeConfig.read(strErr)) {
-            fprintf(stderr, "Error reading masternode configuration file: %s\n", strErr.c_str());
-            return false;
-        }
-
         // Error out when loose non-argument tokens are encountered on command line
         for (int i = 1; i < argc; i++) {
             if (!IsSwitchChar(argv[i][0])) {
diff --git a/src/qt/pivx.cpp b/src/qt/pivx.cpp
@@ -14,7 +14,6 @@
 #include "fs.h"
 #include "guiinterface.h"
 #include "init.h"
-#include "masternodeconfig.h"
 #include "net.h"
 #include "qt/clientmodel.h"
 #include "qt/guiconstants.h"
@@ -654,14 +653,6 @@ int main(int argc, char* argv[])
     app.updateTranslation();
 
 #ifdef ENABLE_WALLET
-    /// 7a. parse masternode.conf
-    std::string strErr;
-    if (!masternodeConfig.read(strErr)) {
-        QMessageBox::critical(nullptr, PACKAGE_NAME,
-            QObject::tr("Error reading masternode configuration file: %1").arg(strErr.c_str()));
-        return 0;
-    }
-
     /// 8. URI IPC sending
     // - Do this early as we don't want to bother initializing if we are just calling IPC
     // - Do this *after* setting up the data directory, as the data directory hash is used in the name
diff --git a/src/tiertwo/init.cpp b/src/tiertwo/init.cpp
@@ -115,6 +115,14 @@ bool LoadTierTwo(int chain_active_height, bool fReindexChainState)
         LogPrintf("Error reading mnpayments.dat - cached data discarded\n");
     }
 
+    // ###################################### //
+    // ## Legacy Parse 'masternodes.conf'  ## //
+    // ###################################### //
+    std::string strErr;
+    if (!masternodeConfig.read(strErr)) {
+        return UIError(strprintf(_("Error reading masternode configuration file: %s"), strErr));
+    }
+
     // ############################## //
     // ## Net MNs Metadata Manager ## //
     // ############################## //
