[Move-only] Move tier two managers dump from init.cpp to a separate "tiertwo/init.cpp"

furszy · furszy · commit a04bf92d4c9e · 2021-12-19T09:18:14.000-03:00
Same for budget finalization mode.
diff --git a/src/init.cpp b/src/init.cpp
@@ -18,8 +18,6 @@
 #include "addrman.h"
 #include "amount.h"
 #include "bls/bls_wrapper.h"
-#include "budget/budgetdb.h"
-#include "budget/budgetmanager.h"
 #include "checkpoints.h"
 #include "compat/sanity.h"
 #include "consensus/upgrades.h"
@@ -31,7 +29,6 @@
 #include "invalid.h"
 #include "key.h"
 #include "mapport.h"
-#include "masternode-payments.h"
 #include "masternodeconfig.h"
 #include "masternodeman.h"
 #include "miner.h"
@@ -228,9 +225,7 @@ void Shutdown()
     g_connman.reset();
     peerLogic.reset();
 
-    DumpMasternodes();
-    DumpBudgets(g_budgetman);
-    DumpMasternodePayments();
+    DumpTierTwo();
     if (::mempool.IsLoaded() && gArgs.GetBoolArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {
         DumpMempool(::mempool);
     }
@@ -1772,8 +1767,8 @@ bool AppInitMain()
         }
     }
 
-    //get the mode of budget voting for this masternode
-    g_budgetman.strBudgetMode = gArgs.GetArg("-budgetvotemode", "auto");
+    // set the mode of budget voting for this node
+    SetBudgetFinMode(gArgs.GetArg("-budgetvotemode", "auto"));
 
 #ifdef ENABLE_WALLET
     // !TODO: remove after complete transition to DMN
@@ -1807,7 +1802,6 @@ bool AppInitMain()
     }
 
     LogPrintf("fLiteMode %d\n", fLiteMode);
-    LogPrintf("Budget Mode %s\n", g_budgetman.strBudgetMode.c_str());
 
     threadGroup.create_thread(std::bind(&ThreadCheckMasternodes));
 
diff --git a/src/tiertwo/init.cpp b/src/tiertwo/init.cpp
@@ -80,4 +80,17 @@ void RegisterTierTwoValidationInterface()
 {
     RegisterValidationInterface(&g_budgetman);
     RegisterValidationInterface(&masternodePayments);
+}
+
+void DumpTierTwo()
+{
+    DumpMasternodes();
+    DumpBudgets(g_budgetman);
+    DumpMasternodePayments();
+}
+
+void SetBudgetFinMode(const std::string& mode)
+{
+    g_budgetman.strBudgetMode = mode;
+    LogPrintf("Budget Mode %s\n", g_budgetman.strBudgetMode);
 }
diff --git a/src/tiertwo/init.h b/src/tiertwo/init.h
@@ -12,5 +12,10 @@ bool LoadTierTwo(int chain_active_height);
 /** Register all tier two objects */
 void RegisterTierTwoValidationInterface();
 
+/** Dump tier two managers to disk */
+void DumpTierTwo();
+
+void SetBudgetFinMode(const std::string& mode);
+
 
 #endif //PIVX_TIERTWO_INIT_H
