diff --git a/src/llmq/blockprocessor.cpp b/src/llmq/blockprocessor.cpp index f3c6c9f9709bb..ac4ca6eb43027 100644 --- a/src/llmq/blockprocessor.cpp +++ b/src/llmq/blockprocessor.cpp @@ -38,9 +38,6 @@ static void PreComputeQuorumMembers(CDeterministicMNManager& dmnman, const CBloc namespace llmq { - -std::unique_ptr quorumBlockProcessor; - static const std::string DB_MINED_COMMITMENT = "q_mc"; static const std::string DB_MINED_COMMITMENT_BY_INVERSED_HEIGHT = "q_mcih"; static const std::string DB_MINED_COMMITMENT_BY_INVERSED_HEIGHT_Q_INDEXED = "q_mcihi"; diff --git a/src/llmq/blockprocessor.h b/src/llmq/blockprocessor.h index b77f125233a3f..a1131a9a19698 100644 --- a/src/llmq/blockprocessor.h +++ b/src/llmq/blockprocessor.h @@ -79,9 +79,6 @@ class CQuorumBlockProcessor size_t GetNumCommitmentsRequired(const Consensus::LLMQParams& llmqParams, int nHeight) const EXCLUSIVE_LOCKS_REQUIRED(cs_main); static uint256 GetQuorumBlockHash(const Consensus::LLMQParams& llmqParams, int nHeight, int quorumIndex) EXCLUSIVE_LOCKS_REQUIRED(cs_main); }; - -extern std::unique_ptr quorumBlockProcessor; - } // namespace llmq #endif // BITCOIN_LLMQ_BLOCKPROCESSOR_H diff --git a/src/llmq/context.cpp b/src/llmq/context.cpp index 220cd2de11562..fc04b56accd69 100644 --- a/src/llmq/context.cpp +++ b/src/llmq/context.cpp @@ -24,11 +24,7 @@ LLMQContext::LLMQContext(CChainState& chainstate, CConnman& connman, CDeterminis is_masternode{mn_activeman != nullptr}, bls_worker{std::make_shared()}, dkg_debugman{std::make_unique()}, - quorum_block_processor{[&]() -> llmq::CQuorumBlockProcessor* const { - assert(llmq::quorumBlockProcessor == nullptr); - llmq::quorumBlockProcessor = std::make_unique(chainstate, dmnman, evo_db, peerman); - return llmq::quorumBlockProcessor.get(); - }()}, + quorum_block_processor{std::make_unique(chainstate, dmnman, evo_db, peerman)}, qdkgsman{std::make_unique(*bls_worker, chainstate, connman, dmnman, *dkg_debugman, mn_metaman, *quorum_block_processor, mn_activeman, sporkman, peerman, unit_tests, wipe)}, qman{[&]() -> llmq::CQuorumManager* const { assert(llmq::quorumManager == nullptr); @@ -59,7 +55,6 @@ LLMQContext::~LLMQContext() { llmq::quorumInstantSendManager.reset(); llmq::chainLocksHandler.reset(); llmq::quorumManager.reset(); - llmq::quorumBlockProcessor.reset(); } void LLMQContext::Interrupt() { @@ -71,7 +66,6 @@ void LLMQContext::Interrupt() { } void LLMQContext::Start() { - assert(quorum_block_processor == llmq::quorumBlockProcessor.get()); assert(qman == llmq::quorumManager.get()); assert(clhandler == llmq::chainLocksHandler.get()); assert(isman == llmq::quorumInstantSendManager.get()); @@ -90,7 +84,6 @@ void LLMQContext::Start() { } void LLMQContext::Stop() { - assert(quorum_block_processor == llmq::quorumBlockProcessor.get()); assert(qman == llmq::quorumManager.get()); assert(clhandler == llmq::chainLocksHandler.get()); assert(isman == llmq::quorumInstantSendManager.get()); diff --git a/src/llmq/context.h b/src/llmq/context.h index 99c73c84cb742..6122525217fb5 100644 --- a/src/llmq/context.h +++ b/src/llmq/context.h @@ -62,7 +62,7 @@ struct LLMQContext { */ const std::shared_ptr bls_worker; const std::unique_ptr dkg_debugman; - llmq::CQuorumBlockProcessor* const quorum_block_processor; + const std::unique_ptr quorum_block_processor; const std::unique_ptr qdkgsman; llmq::CQuorumManager* const qman; const std::unique_ptr sigman;