refactor: remove unused CConnman from CDeterministicMNManager ctor

kwvg · kwvg · commit ac930a84d80a · 2024-12-05T22:42:15.000Z
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
@@ -30,7 +30,6 @@ class CBlock;
 class CBlockIndex;
 class CChainState;
 class CCoinsViewCache;
-class CConnman;
 class CEvoDB;
 class TxValidationState;
 
@@ -583,7 +582,6 @@ class CDeterministicMNManager
     std::atomic<int> to_cleanup {0};
 
     CChainState& m_chainstate;
-    CConnman& connman;
     CEvoDB& m_evoDb;
 
     std::unordered_map<uint256, CDeterministicMNList, StaticSaltedHasher> mnListsCache GUARDED_BY(cs);
@@ -592,8 +590,11 @@ class CDeterministicMNManager
     const CBlockIndex* m_initial_snapshot_index GUARDED_BY(cs) {nullptr};
 
 public:
-    explicit CDeterministicMNManager(CChainState& chainstate, CConnman& _connman, CEvoDB& evoDb) :
-        m_chainstate(chainstate), connman(_connman), m_evoDb(evoDb) {}
+    explicit CDeterministicMNManager(CChainState& chainstate, CEvoDB& evoDb) :
+        m_chainstate(chainstate),
+        m_evoDb(evoDb)
+    {
+    }
     ~CDeterministicMNManager() = default;
 
     bool ProcessBlock(const CBlock& block, gsl::not_null<const CBlockIndex*> pindex, BlockValidationState& state,
diff --git a/src/init.cpp b/src/init.cpp
@@ -1888,7 +1888,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 
                 // Same logic as above with pblocktree
                 node.dmnman.reset();
-                node.dmnman = std::make_unique<CDeterministicMNManager>(chainman.ActiveChainstate(), *node.connman, *node.evodb);
+                node.dmnman = std::make_unique<CDeterministicMNManager>(chainman.ActiveChainstate(), *node.evodb);
                 node.mempool->ConnectManagers(node.dmnman.get());
 
                 node.cpoolman.reset();
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
@@ -107,7 +107,7 @@ void DashTestSetup(NodeContext& node, const CChainParams& chainparams)
 {
     CChainState& chainstate = Assert(node.chainman)->ActiveChainstate();
 
-    node.dmnman = std::make_unique<CDeterministicMNManager>(chainstate, *node.connman, *node.evodb);
+    node.dmnman = std::make_unique<CDeterministicMNManager>(chainstate, *node.evodb);
     node.mempool->ConnectManagers(node.dmnman.get());
 
     node.cj_ctx = std::make_unique<CJContext>(*node.chainman, *node.connman, *node.dmnman, *node.mn_metaman, *node.mempool,

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ void DashTestSetup(NodeContext& node, const CChainParams& chainparams)`
`107`	`107`	`{`
`108`	`108`	`CChainState& chainstate = Assert(node.chainman)->ActiveChainstate();`
`109`	`109`
`110`		`- node.dmnman = std::make_unique<CDeterministicMNManager>(chainstate, node.connman, node.evodb);`
	`110`	`+ node.dmnman = std::make_unique<CDeterministicMNManager>(chainstate, *node.evodb);`
`111`	`111`	`node.mempool->ConnectManagers(node.dmnman.get());`
`112`	`112`
`113`	`113`	`node.cj_ctx = std::make_unique<CJContext>(node.chainman, node.connman, node.dmnman, node.mn_metaman, *node.mempool,`