refactor: including of dbwrapper moved to cpp files

dashpay · Nov 14, 2023 · 6a39a73 · 6a39a73
1 parent 929209a
commit 6a39a73
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 13 deletions.
diff --git a/src/llmq/dkgsessionmgr.cpp b/src/llmq/dkgsessionmgr.cpp
@@ -10,6 +10,7 @@
 #include <evo/deterministicmns.h>
 
 #include <chainparams.h>
+#include <dbwrapper.h>
 #include <net_processing.h>
 #include <spork.h>
 #include <util/irange.h>

diff --git a/src/llmq/dkgsessionmgr.h b/src/llmq/dkgsessionmgr.h
@@ -15,6 +15,7 @@
 
 class CBlockIndex;
 class CChainState;
+class CDBWrapper;
 class CDKGDebugManager;
 class CSporkManager;
 class PeerManager;

diff --git a/src/llmq/instantsend.cpp b/src/llmq/instantsend.cpp
@@ -13,6 +13,7 @@
 #include <bls/bls_batchverifier.h>
 #include <chainparams.h>
 #include <consensus/validation.h>
+#include <dbwrapper.h>
 #include <index/txindex.h>
 #include <masternode/sync.h>
 #include <net_processing.h>
@@ -57,6 +58,13 @@ uint256 CInstantSendLock::GetRequestId() const
 ////////////////
 
 
+CInstantSendDb::CInstantSendDb(bool unitTests, bool fWipe) :
+    db(std::make_unique<CDBWrapper>(unitTests ? "" : (GetDataDir() / "llmq/isdb"), 32 << 20, unitTests, fWipe))
+{
+}
+
+CInstantSendDb::~CInstantSendDb() = default;
+
 void CInstantSendDb::Upgrade(const CTxMemPool& mempool)
 {
     LOCK2(cs_main, mempool.cs);

diff --git a/src/llmq/instantsend.h b/src/llmq/instantsend.h
@@ -10,7 +10,6 @@
 
 #include <chain.h>
 #include <coins.h>
-#include <dbwrapper.h>
 #include <primitives/transaction.h>
 #include <threadinterrupt.h>
 #include <txmempool.h>
@@ -22,6 +21,7 @@
 #include <unordered_set>
 
 class CChainState;
+class CDBWrapper;
 class CMasternodeSync;
 class CSporkManager;
 class PeerManager;
@@ -121,9 +121,8 @@ class CInstantSendDb
 
 
 public:
-    explicit CInstantSendDb(bool unitTests, bool fWipe) :
-            db(std::make_unique<CDBWrapper>(unitTests ? "" : (GetDataDir() / "llmq/isdb"), 32 << 20, unitTests, fWipe))
-    {}
+    explicit CInstantSendDb(bool unitTests, bool fWipe);
+    ~CInstantSendDb();
 
     void Upgrade(const CTxMemPool& mempool) LOCKS_EXCLUDED(cs_db);
 

diff --git a/src/llmq/signing.cpp b/src/llmq/signing.cpp
@@ -12,10 +12,12 @@
 #include <bls/bls_batchverifier.h>
 #include <chainparams.h>
 #include <cxxtimer.hpp>
+#include <dbwrapper.h>
 #include <masternode/node.h>
 #include <net_processing.h>
 #include <netmessagemaker.h>
 #include <scheduler.h>
+#include <streams.h>
 #include <util/irange.h>
 #include <util/time.h>
 #include <util/underlying.h>
@@ -39,6 +41,14 @@ UniValue CRecoveredSig::ToJson() const
 }
 
 
+CRecoveredSigsDb::CRecoveredSigsDb(bool fMemory, bool fWipe) :
+        db(std::make_unique<CDBWrapper>(fMemory ? "" : (GetDataDir() / "llmq/recsigdb"), 8 << 20, fMemory, fWipe))
+{
+    MigrateRecoveredSigs();
+}
+
+CRecoveredSigsDb::~CRecoveredSigsDb() = default;
+
 void CRecoveredSigsDb::MigrateRecoveredSigs()
 {
     if (!db->IsEmpty()) return;

diff --git a/src/llmq/signing.h b/src/llmq/signing.h
@@ -9,7 +9,6 @@
 #include <unordered_lru_cache.h>
 
 #include <consensus/params.h>
-#include <dbwrapper.h>
 #include <random.h>
 #include <saltedhasher.h>
 #include <sync.h>
@@ -18,6 +17,9 @@
 #include <unordered_map>
 
 class CConnman;
+class CDataStream;
+class CDBBatch;
+class CDBWrapper;
 class CInv;
 class CNode;
 class PeerManager;
@@ -115,11 +117,8 @@ class CRecoveredSigsDb
     mutable unordered_lru_cache<uint256, bool, StaticSaltedHasher, 30000> hasSigForHashCache GUARDED_BY(cs);
 
 public:
-    explicit CRecoveredSigsDb(bool fMemory, bool fWipe) :
-            db(std::make_unique<CDBWrapper>(fMemory ? "" : (GetDataDir() / "llmq/recsigdb"), 8 << 20, fMemory, fWipe))
-    {
-        MigrateRecoveredSigs();
-    }
+    explicit CRecoveredSigsDb(bool fMemory, bool fWipe);
+    ~CRecoveredSigsDb();
 
     bool HasRecoveredSig(Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash) const;
     bool HasRecoveredSigForId(Consensus::LLMQType llmqType, const uint256& id) const;

diff --git a/src/llmq/utils.h b/src/llmq/utils.h
@@ -7,7 +7,6 @@
 
 #include <consensus/params.h>
 
-#include <dbwrapper.h>
 #include <random.h>
 #include <set>
 #include <sync.h>

diff --git a/src/test/evo_instantsend_tests.cpp b/src/test/evo_instantsend_tests.cpp
@@ -2,10 +2,10 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <test/util/setup_common.h>
-
 #include <llmq/instantsend.h>
 
+#include <test/util/setup_common.h>
+
 #include <boost/test/unit_test.hpp>
 
 BOOST_FIXTURE_TEST_SUITE(evo_instantsend_tests, BasicTestingSetup)