fix: resolve -Wunused-private-field warnings

kwvg · kwvg · commit 7459b1e09485 · 2025-04-22T15:51:05.000Z
diff --git a/src/coinjoin/client.cpp b/src/coinjoin/client.cpp
@@ -105,7 +105,7 @@ PeerMsgRet CCoinJoinClientQueueManager::ProcessDSQueue(const CNode& peer, CConnm
 
         // if the queue is ready, submit if we can
         if (dsq.fReady &&
-            m_walletman.ForAnyCJClientMan([this, &connman, &dmn](std::unique_ptr<CCoinJoinClientManager>& clientman) {
+            m_walletman.ForAnyCJClientMan([&connman, &dmn](std::unique_ptr<CCoinJoinClientManager>& clientman) {
                 return clientman->TrySubmitDenominate(dmn->proTxHash, connman);
             })) {
             LogPrint(BCLog::COINJOIN, "DSQUEUE -- CoinJoin queue is ready, masternode=%s, queue=%s\n", dmn->proTxHash.ToString(), dsq.ToString());
@@ -161,14 +161,12 @@ void CCoinJoinClientManager::ProcessMessage(CNode& peer, CChainState& active_cha
     }
 }
 
-CCoinJoinClientSession::CCoinJoinClientSession(const std::shared_ptr<CWallet>& wallet, CoinJoinWalletManager& walletman,
-                                               CCoinJoinClientManager& clientman, CDeterministicMNManager& dmnman,
-                                               CMasternodeMetaMan& mn_metaman, const CMasternodeSync& mn_sync,
-                                               const llmq::CInstantSendManager& isman,
+CCoinJoinClientSession::CCoinJoinClientSession(const std::shared_ptr<CWallet>& wallet, CCoinJoinClientManager& clientman,
+                                               CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
+                                               const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
                                                const std::unique_ptr<CCoinJoinClientQueueManager>& queueman,
                                                bool is_masternode) :
     m_wallet(wallet),
-    m_walletman(walletman),
     m_clientman(clientman),
     m_dmnman(dmnman),
     m_mn_metaman(mn_metaman),
@@ -998,8 +996,7 @@ bool CCoinJoinClientManager::DoAutomaticDenominating(ChainstateManager& chainman
     AssertLockNotHeld(cs_deqsessions);
     LOCK(cs_deqsessions);
     if (int(deqSessions.size()) < CCoinJoinClientOptions::GetSessions()) {
-        deqSessions.emplace_back(m_wallet, m_walletman, *this, m_dmnman, m_mn_metaman, m_mn_sync, m_isman, m_queueman,
-                                 m_is_masternode);
+        deqSessions.emplace_back(m_wallet, *this, m_dmnman, m_mn_metaman, m_mn_sync, m_isman, m_queueman, m_is_masternode);
     }
     for (auto& session : deqSessions) {
         if (!CheckAutomaticBackup()) return false;
@@ -1905,9 +1902,8 @@ void CoinJoinWalletManager::Add(const std::shared_ptr<CWallet>& wallet)
 {
     LOCK(cs_wallet_manager_map);
     m_wallet_manager_map.try_emplace(wallet->GetName(),
-                                     std::make_unique<CCoinJoinClientManager>(wallet, *this, m_dmnman, m_mn_metaman,
-                                                                              m_mn_sync, m_isman, m_queueman,
-                                                                              m_is_masternode));
+                                     std::make_unique<CCoinJoinClientManager>(wallet, m_dmnman, m_mn_metaman, m_mn_sync,
+                                                                              m_isman, m_queueman, m_is_masternode));
 }
 
 void CoinJoinWalletManager::DoMaintenance(CConnman& connman)
diff --git a/src/coinjoin/client.h b/src/coinjoin/client.h
@@ -139,7 +139,6 @@ class CCoinJoinClientSession : public CCoinJoinBaseSession
 {
 private:
     const std::shared_ptr<CWallet> m_wallet;
-    CoinJoinWalletManager& m_walletman;
     CCoinJoinClientManager& m_clientman;
     CDeterministicMNManager& m_dmnman;
     CMasternodeMetaMan& m_mn_metaman;
@@ -201,10 +200,9 @@ class CCoinJoinClientSession : public CCoinJoinBaseSession
     void SetNull() override EXCLUSIVE_LOCKS_REQUIRED(cs_coinjoin);
 
 public:
-    explicit CCoinJoinClientSession(const std::shared_ptr<CWallet>& wallet, CoinJoinWalletManager& walletman,
-                                    CCoinJoinClientManager& clientman, CDeterministicMNManager& dmnman,
-                                    CMasternodeMetaMan& mn_metaman, const CMasternodeSync& mn_sync,
-                                    const llmq::CInstantSendManager& isman,
+    explicit CCoinJoinClientSession(const std::shared_ptr<CWallet>& wallet, CCoinJoinClientManager& clientman,
+                                    CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
+                                    const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
                                     const std::unique_ptr<CCoinJoinClientQueueManager>& queueman, bool is_masternode);
 
     void ProcessMessage(CNode& peer, CChainState& active_chainstate, CConnman& connman, const CTxMemPool& mempool, std::string_view msg_type, CDataStream& vRecv);
@@ -266,7 +264,6 @@ class CCoinJoinClientManager
 {
 private:
     const std::shared_ptr<CWallet> m_wallet;
-    CoinJoinWalletManager& m_walletman;
     CDeterministicMNManager& m_dmnman;
     CMasternodeMetaMan& m_mn_metaman;
     const CMasternodeSync& m_mn_sync;
@@ -305,12 +302,11 @@ class CCoinJoinClientManager
     CCoinJoinClientManager(CCoinJoinClientManager const&) = delete;
     CCoinJoinClientManager& operator=(CCoinJoinClientManager const&) = delete;
 
-    explicit CCoinJoinClientManager(const std::shared_ptr<CWallet>& wallet, CoinJoinWalletManager& walletman,
-                                    CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman,
-                                    const CMasternodeSync& mn_sync, const llmq::CInstantSendManager& isman,
+    explicit CCoinJoinClientManager(const std::shared_ptr<CWallet>& wallet, CDeterministicMNManager& dmnman,
+                                    CMasternodeMetaMan& mn_metaman, const CMasternodeSync& mn_sync,
+                                    const llmq::CInstantSendManager& isman,
                                     const std::unique_ptr<CCoinJoinClientQueueManager>& queueman, bool is_masternode) :
         m_wallet(wallet),
-        m_walletman(walletman),
         m_dmnman(dmnman),
         m_mn_metaman(mn_metaman),
         m_mn_sync(mn_sync),
diff --git a/src/evo/creditpool.cpp b/src/evo/creditpool.cpp
@@ -235,10 +235,10 @@ CCreditPoolManager::CCreditPoolManager(CEvoDB& _evoDb)
 {
 }
 
-CCreditPoolDiff::CCreditPoolDiff(CCreditPool starter, const CBlockIndex *pindexPrev, const Consensus::Params& consensusParams, const CAmount blockSubsidy) :
+CCreditPoolDiff::CCreditPoolDiff(CCreditPool starter, const CBlockIndex* pindexPrev,
+                                 const Consensus::Params& consensusParams, const CAmount blockSubsidy) :
     pool(std::move(starter)),
-    pindexPrev(pindexPrev),
-    params(consensusParams)
+    pindexPrev(pindexPrev)
 {
     assert(pindexPrev);
 
diff --git a/src/evo/creditpool.h b/src/evo/creditpool.h
@@ -75,7 +75,7 @@ class CCreditPoolDiff {
     CAmount platformReward{0};
 
     const CBlockIndex *pindexPrev{nullptr};
-    const Consensus::Params& params;
+
 public:
     explicit CCreditPoolDiff(CCreditPool starter, const CBlockIndex *pindexPrev,
                              const Consensus::Params& consensusParams,
diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
@@ -563,7 +563,6 @@ class CDeterministicMNManager
     // Main thread has indicated we should perform cleanup up to this height
     std::atomic<int> to_cleanup {0};
 
-    CChainState& m_chainstate;
     CEvoDB& m_evoDb;
 
     std::unordered_map<uint256, CDeterministicMNList, StaticSaltedHasher> mnListsCache GUARDED_BY(cs);
@@ -572,8 +571,7 @@ class CDeterministicMNManager
     const CBlockIndex* m_initial_snapshot_index GUARDED_BY(cs) {nullptr};
 
 public:
-    explicit CDeterministicMNManager(CChainState& chainstate, CEvoDB& evoDb) :
-        m_chainstate(chainstate),
+    explicit CDeterministicMNManager(CEvoDB& evoDb) :
         m_evoDb(evoDb)
     {
     }
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
@@ -213,7 +213,7 @@ void DashChainstateSetup(ChainstateManager& chainman,
 {
     // Same logic as pblocktree
     dmnman.reset();
-    dmnman = std::make_unique<CDeterministicMNManager>(chainman.ActiveChainstate(), *evodb);
+    dmnman = std::make_unique<CDeterministicMNManager>(*evodb);
 
     cpoolman.reset();
     cpoolman = std::make_unique<CCreditPoolManager>(*evodb);
diff --git a/src/wallet/hdchain.h b/src/wallet/hdchain.h
@@ -122,7 +122,7 @@ class CHDPubKey
 {
 private:
     static const int CURRENT_VERSION = 1;
-    int nVersion{CHDPubKey::CURRENT_VERSION};
+    [[maybe_unused]] int nVersion{CHDPubKey::CURRENT_VERSION};
 
 public:
     CExtPubKey extPubKey{};

Original file line number	Diff line number	Diff line change
`@@ -235,10 +235,10 @@ CCreditPoolManager::CCreditPoolManager(CEvoDB& _evoDb)`
`235`	`235`	`{`
`236`	`236`	`}`
`237`	`237`
`238`		`-CCreditPoolDiff::CCreditPoolDiff(CCreditPool starter, const CBlockIndex *pindexPrev, const Consensus::Params& consensusParams, const CAmount blockSubsidy) :`
	`238`	`+CCreditPoolDiff::CCreditPoolDiff(CCreditPool starter, const CBlockIndex* pindexPrev,`
	`239`	`+ const Consensus::Params& consensusParams, const CAmount blockSubsidy) :`
`239`	`240`	`pool(std::move(starter)),`
`240`		`- pindexPrev(pindexPrev),`
`241`		`- params(consensusParams)`
	`241`	`+ pindexPrev(pindexPrev)`
`242`	`242`	`{`
`243`	`243`	`assert(pindexPrev);`
`244`	`244`
Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,6 @@ class CDeterministicMNManager`
`563`	`563`	`// Main thread has indicated we should perform cleanup up to this height`
`564`	`564`	`std::atomic<int> to_cleanup {0};`
`565`	`565`
`566`		`- CChainState& m_chainstate;`
`567`	`566`	`CEvoDB& m_evoDb;`
`568`	`567`
`569`	`568`	`std::unordered_map<uint256, CDeterministicMNList, StaticSaltedHasher> mnListsCache GUARDED_BY(cs);`
`@@ -572,8 +571,7 @@ class CDeterministicMNManager`
`572`	`571`	`const CBlockIndex* m_initial_snapshot_index GUARDED_BY(cs) {nullptr};`
`573`	`572`
`574`	`573`	`public:`
`575`		`- explicit CDeterministicMNManager(CChainState& chainstate, CEvoDB& evoDb) :`
`576`		`- m_chainstate(chainstate),`
	`574`	`+ explicit CDeterministicMNManager(CEvoDB& evoDb) :`
`577`	`575`	`m_evoDb(evoDb)`
`578`	`576`	`{`
`579`	`577`	`}`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ void DashChainstateSetup(ChainstateManager& chainman,`
`213`	`213`	`{`
`214`	`214`	`// Same logic as pblocktree`
`215`	`215`	`dmnman.reset();`
`216`		`- dmnman = std::make_unique<CDeterministicMNManager>(chainman.ActiveChainstate(), *evodb);`
	`216`	`+ dmnman = std::make_unique<CDeterministicMNManager>(*evodb);`
`217`	`217`
`218`	`218`	`cpoolman.reset();`
`219`	`219`	`cpoolman = std::make_unique<CCreditPoolManager>(*evodb);`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ class CHDPubKey`
`122`	`122`	`{`
`123`	`123`	`private:`
`124`	`124`	`static const int CURRENT_VERSION = 1;`
`125`		`- int nVersion{CHDPubKey::CURRENT_VERSION};`
	`125`	`+ [[maybe_unused]] int nVersion{CHDPubKey::CURRENT_VERSION};`
`126`	`126`
`127`	`127`	`public:`
`128`	`128`	`CExtPubKey extPubKey{};`