From 917089d542e7e5b1767918d945f4cdfb05d00dde Mon Sep 17 00:00:00 2001 From: Konstantin Akimov Date: Tue, 5 Dec 2023 03:18:43 +0700 Subject: [PATCH] refactor: drop public llmq::utils::IsV20Active method --- src/llmq/utils.cpp | 10 +++++----- src/llmq/utils.h | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/llmq/utils.cpp b/src/llmq/utils.cpp index b7006331c6..f4549563c1 100644 --- a/src/llmq/utils.cpp +++ b/src/llmq/utils.cpp @@ -38,6 +38,11 @@ static bool IsV19Active(gsl::not_null pindexPrev) return DeploymentActiveAfter(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_V19); } +static bool IsV20Active(gsl::not_null pindexPrev) +{ + return llmq_versionbitscache.State(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_V20) == ThresholdState::ACTIVE; +} + namespace llmq { @@ -686,11 +691,6 @@ bool IsQuorumRotationEnabled(const Consensus::LLMQParams& llmqParams, gsl::not_n return DeploymentActiveAfter(pindex->GetAncestor(cycleQuorumBaseHeight - 1), Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0024); } -bool IsV20Active(gsl::not_null pindex) -{ - return llmq_versionbitscache.State(pindex, Params().GetConsensus(), Consensus::DEPLOYMENT_V20) == ThresholdState::ACTIVE; -} - uint256 DeterministicOutboundConnection(const uint256& proTxHash1, const uint256& proTxHash2) { // We need to deterministically select who is going to initiate the connection. The naive way would be to simply diff --git a/src/llmq/utils.h b/src/llmq/utils.h index b0bcdc1ca4..8a09a58ae0 100644 --- a/src/llmq/utils.h +++ b/src/llmq/utils.h @@ -77,8 +77,6 @@ std::vector> GetEnabledQuoru // TODO options bool IsQuorumRotationEnabled(const Consensus::LLMQParams& llmqParams, gsl::not_null pindex); -// TODO deployments -bool IsV20Active(gsl::not_null pindex); /// Returns the state of `-llmq-data-recovery` // TODO options