Use llmqDb for CRecoveredSigsDb

Instead of creating its own CDBWrapper internally.
dashpay · Mar 8, 2019 · 61e10f6 · 61e10f6
1 parent b2cd1db
commit 61e10f6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/llmq/quorums_init.cpp b/src/llmq/quorums_init.cpp
@@ -33,7 +33,7 @@ void InitLLMQSystem(CEvoDB& evoDb, CScheduler* scheduler, bool unitTests)
     quorumDKGSessionManager = new CDKGSessionManager(*llmqDb, blsWorker);
     quorumManager = new CQuorumManager(evoDb, blsWorker, *quorumDKGSessionManager);
     quorumSigSharesManager = new CSigSharesManager();
-    quorumSigningManager = new CSigningManager(unitTests);
+    quorumSigningManager = new CSigningManager(*llmqDb, unitTests);
     chainLocksHandler = new CChainLocksHandler(scheduler);
     quorumInstantSendManager = new CInstantSendManager(scheduler);
 }

diff --git a/src/llmq/quorums_signing.cpp b/src/llmq/quorums_signing.cpp
@@ -24,8 +24,8 @@ namespace llmq
 
 CSigningManager* quorumSigningManager;
 
-CRecoveredSigsDb::CRecoveredSigsDb(bool fMemory) :
-    db(fMemory ? "" : (GetDataDir() / "llmq"), 1 << 20, fMemory)
+CRecoveredSigsDb::CRecoveredSigsDb(CDBWrapper& _db) :
+    db(_db)
 {
 }
 
@@ -290,8 +290,8 @@ void CRecoveredSigsDb::WriteVoteForId(Consensus::LLMQType llmqType, const uint25
 
 //////////////////
 
-CSigningManager::CSigningManager(bool fMemory) :
-    db(fMemory)
+CSigningManager::CSigningManager(CDBWrapper& llmqDb, bool fMemory) :
+    db(llmqDb)
 {
 }
 

diff --git a/src/llmq/quorums_signing.h b/src/llmq/quorums_signing.h
@@ -72,15 +72,15 @@ class CRecoveredSigsDb
     static const size_t MAX_CACHE_TRUNCATE_THRESHOLD = 50000;
 
 private:
-    CDBWrapper db;
+    CDBWrapper& db;
 
     CCriticalSection cs;
     std::unordered_map<std::pair<Consensus::LLMQType, uint256>, std::pair<bool, int64_t>, StaticSaltedHasher> hasSigForIdCache;
     std::unordered_map<uint256, std::pair<bool, int64_t>, StaticSaltedHasher> hasSigForSessionCache;
     std::unordered_map<uint256, std::pair<bool, int64_t>, StaticSaltedHasher> hasSigForHashCache;
 
 public:
-    CRecoveredSigsDb(bool fMemory);
+    CRecoveredSigsDb(CDBWrapper& _db);
 
     bool HasRecoveredSig(Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash);
     bool HasRecoveredSigForId(Consensus::LLMQType llmqType, const uint256& id);
@@ -136,7 +136,7 @@ class CSigningManager
     std::vector<CRecoveredSigsListener*> recoveredSigsListeners;
 
 public:
-    CSigningManager(bool fMemory);
+    CSigningManager(CDBWrapper& llmqDb, bool fMemory);
 
     bool AlreadyHave(const CInv& inv);
     bool GetRecoveredSigForGetData(const uint256& hash, CRecoveredSig& ret);