From 8f3d3db9a4c2e08e25ab62281d7736aaffed417f Mon Sep 17 00:00:00 2001
From: Konstantin Akimov <knstqq@gmail.com>
Date: Mon, 4 Dec 2023 15:48:21 +0700
Subject: [PATCH] refactor: drop dependency governance/classes on llmq/utils

---
 src/governance/classes.cpp |  6 +++---
 src/llmq/utils.cpp         | 10 ----------
 src/llmq/utils.h           |  4 ----
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/governance/classes.cpp b/src/governance/classes.cpp
index b8fe9b4b08..6ee0c2b7f7 100644
--- a/src/governance/classes.cpp
+++ b/src/governance/classes.cpp
@@ -7,9 +7,9 @@
 #include <chainparams.h>
 #include <consensus/validation.h>
 #include <core_io.h>
+#include <deploymentstatus.h>
 #include <governance/governance.h>
 #include <key_io.h>
-#include <llmq/utils.h>
 #include <primitives/transaction.h>
 #include <script/standard.h>
 #include <util/moneystr.h>
@@ -496,13 +496,13 @@ CAmount CSuperblock::GetPaymentsLimit(int nBlockHeight)
     const CBlockIndex* pindex = ::ChainActive().Tip();
     if (pindex->nHeight > nBlockHeight) pindex = pindex->GetAncestor(nBlockHeight);
 
-    const auto v20_state = llmq::utils::GetV20State(pindex);
+    const auto v20_state = g_versionbitscache.State(pindex, consensusParams, Consensus::DEPLOYMENT_V20);
     bool fV20Active{v20_state == ThresholdState::ACTIVE};
     if (!fV20Active && nBlockHeight > pindex->nHeight) {
         // If fV20Active isn't active yet and nBlockHeight refers to a future SuperBlock
         // then we need to check if the fork is locked_in and see if it will be active by the time of the future SuperBlock
         if (v20_state == ThresholdState::LOCKED_IN) {
-            int activation_height = llmq::utils::GetV20Since(pindex) + static_cast<int>(Params().GetConsensus().vDeployments[Consensus::DEPLOYMENT_V20].nWindowSize);
+            int activation_height = g_versionbitscache.StateSinceHeight(pindex, consensusParams, Consensus::DEPLOYMENT_V20) + static_cast<int>(Params().GetConsensus().vDeployments[Consensus::DEPLOYMENT_V20].nWindowSize);
             if (nBlockHeight >= activation_height) {
                 fV20Active = true;
             }
diff --git a/src/llmq/utils.cpp b/src/llmq/utils.cpp
index 62ce2b9d63..e45fb687ec 100644
--- a/src/llmq/utils.cpp
+++ b/src/llmq/utils.cpp
@@ -699,16 +699,6 @@ bool IsMNRewardReallocationActive(gsl::not_null<const CBlockIndex*> pindex)
     return llmq_versionbitscache.State(pindex, Params().GetConsensus(), Consensus::DEPLOYMENT_MN_RR) == ThresholdState::ACTIVE;
 }
 
-ThresholdState GetV20State(gsl::not_null<const CBlockIndex*> pindex)
-{
-    return llmq_versionbitscache.State(pindex, Params().GetConsensus(), Consensus::DEPLOYMENT_V20);
-}
-
-int GetV20Since(gsl::not_null<const CBlockIndex*> pindex)
-{
-    return llmq_versionbitscache.StateSinceHeight(pindex, Params().GetConsensus(), Consensus::DEPLOYMENT_V20);
-}
-
 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 83d633088e..719eae085d 100644
--- a/src/llmq/utils.h
+++ b/src/llmq/utils.h
@@ -83,10 +83,6 @@ bool IsV19Active(gsl::not_null<const CBlockIndex*> pindex);
 bool IsV20Active(gsl::not_null<const CBlockIndex*> pindex);
 // TODO deployments
 bool IsMNRewardReallocationActive(gsl::not_null<const CBlockIndex*> pindex);
-// TODO deployments
-ThresholdState GetV20State(gsl::not_null<const CBlockIndex*> pindex);
-// TODO deployments
-int GetV20Since(gsl::not_null<const CBlockIndex*> pindex);
 
 /// Returns the state of `-llmq-data-recovery`
 // TODO options