diff --git a/src/llmq/quorums_dkgsession.h b/src/llmq/quorums_dkgsession.h index 0449878d76609..b0e110abd1c4c 100644 --- a/src/llmq/quorums_dkgsession.h +++ b/src/llmq/quorums_dkgsession.h @@ -13,7 +13,6 @@ #include "bls/bls_worker.h" #include "evo/deterministicmns.h" -#include "evo/evodb.h" #include "llmq/quorums_utils.h" @@ -246,7 +245,6 @@ class CDKGSession private: const Consensus::LLMQParams& params; - CEvoDB& evoDb; CBLSWorker& blsWorker; CBLSWorkerCache cache; CDKGSessionManager& dkgManager; @@ -287,8 +285,8 @@ class CDKGSession std::set validCommitments; public: - CDKGSession(const Consensus::LLMQParams& _params, CEvoDB& _evoDb, CBLSWorker& _blsWorker, CDKGSessionManager& _dkgManager) : - params(_params), evoDb(_evoDb), blsWorker(_blsWorker), cache(_blsWorker), dkgManager(_dkgManager) {} + CDKGSession(const Consensus::LLMQParams& _params, CBLSWorker& _blsWorker, CDKGSessionManager& _dkgManager) : + params(_params), blsWorker(_blsWorker), cache(_blsWorker), dkgManager(_dkgManager) {} bool Init(int _height, const uint256& _quorumHash, const std::vector& mns, const uint256& _myProTxHash); diff --git a/src/llmq/quorums_dkgsessionhandler.cpp b/src/llmq/quorums_dkgsessionhandler.cpp index 17a57020dd875..d4770e6f6c521 100644 --- a/src/llmq/quorums_dkgsessionhandler.cpp +++ b/src/llmq/quorums_dkgsessionhandler.cpp @@ -83,13 +83,12 @@ void CDKGPendingMessages::Clear() ////// -CDKGSessionHandler::CDKGSessionHandler(const Consensus::LLMQParams& _params, CEvoDB& _evoDb, ctpl::thread_pool& _messageHandlerPool, CBLSWorker& _blsWorker, CDKGSessionManager& _dkgManager) : +CDKGSessionHandler::CDKGSessionHandler(const Consensus::LLMQParams& _params, ctpl::thread_pool& _messageHandlerPool, CBLSWorker& _blsWorker, CDKGSessionManager& _dkgManager) : params(_params), - evoDb(_evoDb), messageHandlerPool(_messageHandlerPool), blsWorker(_blsWorker), dkgManager(_dkgManager), - curSession(std::make_shared(_params, _evoDb, _blsWorker, _dkgManager)), + curSession(std::make_shared(_params, _blsWorker, _dkgManager)), pendingContributions((size_t)_params.size * 2), // we allow size*2 messages as we need to make sure we see bad behavior (double messages) pendingComplaints((size_t)_params.size * 2), pendingJustifications((size_t)_params.size * 2), @@ -146,7 +145,7 @@ bool CDKGSessionHandler::InitNewQuorum(int newQuorumHeight, const uint256& newQu const auto& consensus = Params().GetConsensus(); - curSession = std::make_shared(params, evoDb, blsWorker, dkgManager); + curSession = std::make_shared(params, blsWorker, dkgManager); if (!deterministicMNManager->IsDIP3Enforced(newQuorumHeight)) { return false; diff --git a/src/llmq/quorums_dkgsessionhandler.h b/src/llmq/quorums_dkgsessionhandler.h index 38bf3f72c8205..4fba6c09e489b 100644 --- a/src/llmq/quorums_dkgsessionhandler.h +++ b/src/llmq/quorums_dkgsessionhandler.h @@ -102,7 +102,6 @@ class CDKGSessionHandler std::atomic stopRequested{false}; const Consensus::LLMQParams& params; - CEvoDB& evoDb; ctpl::thread_pool& messageHandlerPool; CBLSWorker& blsWorker; CDKGSessionManager& dkgManager; @@ -119,7 +118,7 @@ class CDKGSessionHandler CDKGPendingMessages pendingPrematureCommitments; public: - CDKGSessionHandler(const Consensus::LLMQParams& _params, CEvoDB& _evoDb, ctpl::thread_pool& _messageHandlerPool, CBLSWorker& blsWorker, CDKGSessionManager& _dkgManager); + CDKGSessionHandler(const Consensus::LLMQParams& _params, ctpl::thread_pool& _messageHandlerPool, CBLSWorker& blsWorker, CDKGSessionManager& _dkgManager); ~CDKGSessionHandler(); void UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload); diff --git a/src/llmq/quorums_dkgsessionmgr.cpp b/src/llmq/quorums_dkgsessionmgr.cpp index f3796a42eab36..dfaaf7c78a79a 100644 --- a/src/llmq/quorums_dkgsessionmgr.cpp +++ b/src/llmq/quorums_dkgsessionmgr.cpp @@ -36,7 +36,7 @@ void CDKGSessionManager::StartMessageHandlerPool() for (const auto& qt : Params().GetConsensus().llmqs) { dkgSessionHandlers.emplace(std::piecewise_construct, std::forward_as_tuple(qt.first), - std::forward_as_tuple(qt.second, evoDb, messageHandlerPool, blsWorker, *this)); + std::forward_as_tuple(qt.second, messageHandlerPool, blsWorker, *this)); } messageHandlerPool.resize(2);