refactor: introduce util::DbWrapperParams and helper to pull out args

kwvg · kwvg · commit 5b2e54a0d74f · 2025-10-29T20:25:13.000+05:30
Helps us reduce our gArgs usage as bitcoin-chainstate won't be having
ArgsManager with it
diff --git a/src/dbwrapper.h b/src/dbwrapper.h
@@ -709,4 +709,19 @@ class CDBTransaction {
     }
 };
 
+namespace util {
+struct DbWrapperParams
+{
+    const fs::path path{""};
+    const bool memory{false};
+    const bool wipe{false};
+    const size_t cache_size{1 << 20};
+};
+
+static inline std::unique_ptr<CDBWrapper> MakeDbWrapper(const DbWrapperParams& params)
+{
+    return std::make_unique<CDBWrapper>(params.path, params.cache_size, params.memory, params.wipe);
+}
+} // namespace util
+
 #endif // BITCOIN_DBWRAPPER_H
diff --git a/src/evo/evodb.cpp b/src/evo/evodb.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <evo/evodb.h>
-#include <util/system.h>
 
 #include <uint256.h>
 
@@ -32,8 +31,8 @@ void CEvoDBScopedCommitter::Rollback()
     evoDB.RollbackCurTransaction();
 }
 
-CEvoDB::CEvoDB(bool fMemory, bool fWipe) :
-    db{std::make_unique<CDBWrapper>(fMemory ? "" : (gArgs.GetDataDirNet() / "evodb"), 64 << 20, fMemory, fWipe)},
+CEvoDB::CEvoDB(const util::DbWrapperParams& db_params) :
+    db{util::MakeDbWrapper({db_params.path / "evodb", db_params.memory, db_params.wipe, /*cache_size=*/64 << 20})},
     rootBatch{*db},
     rootDBTransaction{*db, rootBatch},
     curDBTransaction{rootDBTransaction, rootDBTransaction}
diff --git a/src/evo/evodb.h b/src/evo/evodb.h
@@ -9,6 +9,10 @@
 #include <sync.h>
 
 class uint256;
+namespace util {
+struct DbWrapperParams;
+} // namespace util
+
 // "b_b" was used in the initial version of deterministic MN storage
 // "b_b2" was used after compact diffs were introduced
 // "b_b3" was used after masternode type introduction in evoDB
@@ -49,7 +53,7 @@ class CEvoDB
     CEvoDB() = delete;
     CEvoDB(const CEvoDB&) = delete;
     CEvoDB& operator=(const CEvoDB&) = delete;
-    explicit CEvoDB(bool fMemory, bool fWipe);
+    explicit CEvoDB(const util::DbWrapperParams& db_params);
     ~CEvoDB();
 
     std::unique_ptr<CEvoDBScopedCommitter> BeginTransaction() EXCLUSIVE_LOCKS_REQUIRED(!cs)
diff --git a/src/init.cpp b/src/init.cpp
@@ -1981,6 +1981,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
                                               node.mnhf_manager,
                                               node.llmq_ctx,
                                               Assert(node.mempool.get()),
+                                              args.GetDataDirNet(),
                                               fPruneMode,
                                               args.GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX),
                                               is_governance_enabled,
diff --git a/src/instantsend/db.cpp b/src/instantsend/db.cpp
@@ -26,23 +26,22 @@ static std::tuple<std::string, uint32_t, uint256> BuildInversedISLockKey(std::st
 }
 } // anonymous namespace
 
-CInstantSendDb::CInstantSendDb(bool unitTests, bool fWipe) :
-    db(std::make_unique<CDBWrapper>(unitTests ? "" : (gArgs.GetDataDirNet() / "llmq/isdb"), 32 << 20, unitTests, fWipe))
+CInstantSendDb::CInstantSendDb(const util::DbWrapperParams& db_params) :
+    db{util::MakeDbWrapper({db_params.path / "llmq" / "isdb", db_params.memory, db_params.wipe, /*cache_size=*/32 << 20})}
 {
-    Upgrade(unitTests);
+    Upgrade({db_params.path / "llmq" / "isdb", db_params.memory, /*wipe=*/true, /*cache_size=*/32 << 20});
 }
 
 CInstantSendDb::~CInstantSendDb() = default;
 
-void CInstantSendDb::Upgrade(bool unitTests)
+void CInstantSendDb::Upgrade(const util::DbWrapperParams& db_params)
 {
     LOCK(cs_db);
     int v{0};
     if (!db->Read(DB_VERSION, v) || v < CInstantSendDb::CURRENT_VERSION) {
         // Wipe db
         db.reset();
-        db = std::make_unique<CDBWrapper>(unitTests ? "" : (gArgs.GetDataDirNet() / "llmq/isdb"), 32 << 20, unitTests,
-                                          /*fWipe=*/true);
+        db = util::MakeDbWrapper(db_params);
         CDBBatch batch(*db);
         batch.Write(DB_VERSION, CInstantSendDb::CURRENT_VERSION);
         // Sync DB changes to disk
diff --git a/src/instantsend/db.h b/src/instantsend/db.h
@@ -24,6 +24,9 @@ class CBlockIndex;
 class CDBBatch;
 class CDBWrapper;
 class COutPoint;
+namespace util {
+struct DbWrapperParams;
+} // namespace util
 
 namespace instantsend {
 class CInstantSendDb
@@ -78,10 +81,10 @@ class CInstantSendDb
     uint256 GetInstantSendLockHashByTxidInternal(const uint256& txid) const EXCLUSIVE_LOCKS_REQUIRED(cs_db);
 
 
-    void Upgrade(bool unitTests) EXCLUSIVE_LOCKS_REQUIRED(!cs_db);
+    void Upgrade(const util::DbWrapperParams& db_params) EXCLUSIVE_LOCKS_REQUIRED(!cs_db);
 
 public:
-    explicit CInstantSendDb(bool unitTests, bool fWipe);
+    explicit CInstantSendDb(const util::DbWrapperParams& db_params);
     ~CInstantSendDb();
 
     /**
diff --git a/src/instantsend/instantsend.cpp b/src/instantsend/instantsend.cpp
@@ -58,8 +58,8 @@ Uint256HashSet GetIdsFromLockable(const std::vector<T>& vec)
 
 CInstantSendManager::CInstantSendManager(CChainLocksHandler& _clhandler, CChainState& chainstate, CQuorumManager& _qman,
                                          CSigningManager& _sigman, CSporkManager& sporkman, CTxMemPool& _mempool,
-                                         const CMasternodeSync& mn_sync, bool unitTests, bool fWipe) :
-    db{unitTests, fWipe},
+                                         const CMasternodeSync& mn_sync, const util::DbWrapperParams& db_params) :
+    db{db_params},
     clhandler{_clhandler},
     m_chainstate{chainstate},
     qman{_qman},
diff --git a/src/instantsend/instantsend.h b/src/instantsend/instantsend.h
@@ -31,6 +31,9 @@ class PeerManager;
 namespace Consensus {
 struct LLMQParams;
 } // namespace Consensus
+namespace util {
+struct DbWrapperParams;
+} // namespace util
 
 namespace instantsend {
 class InstantSendSigner;
@@ -94,7 +97,7 @@ class CInstantSendManager final : public instantsend::InstantSendSignerParent
     CInstantSendManager& operator=(const CInstantSendManager&) = delete;
     explicit CInstantSendManager(CChainLocksHandler& _clhandler, CChainState& chainstate, CQuorumManager& _qman,
                                  CSigningManager& _sigman, CSporkManager& sporkman, CTxMemPool& _mempool,
-                                 const CMasternodeSync& mn_sync, bool unitTests, bool fWipe);
+                                 const CMasternodeSync& mn_sync, const util::DbWrapperParams& db_params);
     ~CInstantSendManager();
 
     void ConnectSigner(gsl::not_null<instantsend::InstantSendSigner*> signer)
diff --git a/src/llmq/context.cpp b/src/llmq/context.cpp
@@ -18,22 +18,22 @@
 LLMQContext::LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CEvoDB& evo_db,
                          CMasternodeMetaMan& mn_metaman, CMNHFManager& mnhfman, CSporkManager& sporkman,
                          CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman,
-                         const CMasternodeSync& mn_sync, bool unit_tests, bool wipe) :
+                         const CMasternodeSync& mn_sync, const util::DbWrapperParams& db_params) :
     bls_worker{std::make_shared<CBLSWorker>()},
     dkg_debugman{std::make_unique<llmq::CDKGDebugManager>()},
     qsnapman{std::make_unique<llmq::CQuorumSnapshotManager>(evo_db)},
     quorum_block_processor{
         std::make_unique<llmq::CQuorumBlockProcessor>(chainman.ActiveChainstate(), dmnman, evo_db, *qsnapman)},
     qdkgsman{std::make_unique<llmq::CDKGSessionManager>(*bls_worker, chainman.ActiveChainstate(), dmnman, *dkg_debugman,
                                                         mn_metaman, *quorum_block_processor, *qsnapman, mn_activeman,
-                                                        sporkman, unit_tests, wipe)},
+                                                        sporkman, db_params)},
     qman{std::make_unique<llmq::CQuorumManager>(*bls_worker, chainman.ActiveChainstate(), dmnman, *qdkgsman, evo_db,
                                                 *quorum_block_processor, *qsnapman, mn_activeman, mn_sync, sporkman,
-                                                unit_tests, wipe)},
-    sigman{std::make_unique<llmq::CSigningManager>(chainman.ActiveChainstate(), *qman, unit_tests, wipe)},
+                                                db_params)},
+    sigman{std::make_unique<llmq::CSigningManager>(chainman.ActiveChainstate(), *qman, db_params)},
     clhandler{std::make_unique<llmq::CChainLocksHandler>(chainman.ActiveChainstate(), *qman, sporkman, mempool, mn_sync)},
     isman{std::make_unique<llmq::CInstantSendManager>(*clhandler, chainman.ActiveChainstate(), *qman, *sigman, sporkman,
-                                                      mempool, mn_sync, unit_tests, wipe)}
+                                                      mempool, mn_sync, db_params)}
 {
     // Have to start it early to let VerifyDB check ChainLock signatures in coinbase
     bls_worker->Start();
diff --git a/src/llmq/context.h b/src/llmq/context.h
@@ -28,7 +28,10 @@ class CQuorumBlockProcessor;
 class CQuorumManager;
 class CQuorumSnapshotManager;
 class CSigningManager;
-}
+} // namespace llmq
+namespace util {
+struct DbWrapperParams;
+} // namespace util
 
 struct LLMQContext {
 public:
@@ -38,7 +41,7 @@ struct LLMQContext {
     explicit LLMQContext(ChainstateManager& chainman, CDeterministicMNManager& dmnman, CEvoDB& evo_db,
                          CMasternodeMetaMan& mn_metaman, CMNHFManager& mnhfman, CSporkManager& sporkman,
                          CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman,
-                         const CMasternodeSync& mn_sync, bool unit_tests, bool wipe);
+                         const CMasternodeSync& mn_sync, const util::DbWrapperParams& db_params);
     ~LLMQContext();
 
     void Interrupt();
diff --git a/src/llmq/dkgsessionmgr.cpp b/src/llmq/dkgsessionmgr.cpp
@@ -33,8 +33,8 @@ CDKGSessionManager::CDKGSessionManager(CBLSWorker& _blsWorker, CChainState& chai
                                        CDKGDebugManager& _dkgDebugManager, CMasternodeMetaMan& mn_metaman,
                                        CQuorumBlockProcessor& _quorumBlockProcessor, CQuorumSnapshotManager& qsnapman,
                                        const CActiveMasternodeManager* const mn_activeman,
-                                       const CSporkManager& sporkman, bool unitTests, bool fWipe) :
-    db{std::make_unique<CDBWrapper>(unitTests ? "" : (gArgs.GetDataDirNet() / "llmq/dkgdb"), 1 << 20, unitTests, fWipe)},
+                                       const CSporkManager& sporkman, const util::DbWrapperParams& db_params) :
+    db{util::MakeDbWrapper({db_params.path / "llmq" / "dkgdb", db_params.memory, db_params.wipe, /*cache_size=*/1 << 20})},
     blsWorker{_blsWorker},
     m_chainstate{chainstate},
     m_dmnman{dmnman},
diff --git a/src/llmq/dkgsessionmgr.h b/src/llmq/dkgsessionmgr.h
@@ -33,6 +33,9 @@ class CDKGContribution;
 class CDKGComplaint;
 class CDKGJustification;
 class CDKGPrematureCommitment;
+namespace util {
+struct DbWrapperParams;
+} // namespace util
 
 class UniValue;
 
@@ -85,7 +88,7 @@ class CDKGSessionManager
                                 CDKGDebugManager& _dkgDebugManager, CMasternodeMetaMan& mn_metaman,
                                 CQuorumBlockProcessor& _quorumBlockProcessor, CQuorumSnapshotManager& qsnapman,
                                 const CActiveMasternodeManager* const mn_activeman, const CSporkManager& sporkman,
-                                bool unitTests, bool fWipe);
+                                const util::DbWrapperParams& db_params);
     ~CDKGSessionManager();
 
     void StartThreads(CConnman& connman, PeerManager& peerman);
diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
@@ -211,9 +211,9 @@ CQuorumManager::CQuorumManager(CBLSWorker& _blsWorker, CChainState& chainstate,
                                CDKGSessionManager& _dkgManager, CEvoDB& _evoDb,
                                CQuorumBlockProcessor& _quorumBlockProcessor, CQuorumSnapshotManager& qsnapman,
                                const CActiveMasternodeManager* const mn_activeman, const CMasternodeSync& mn_sync,
-                               const CSporkManager& sporkman, bool unit_tests, bool wipe) :
-    db{std::make_unique<CDBWrapper>(unit_tests ? "" : (gArgs.GetDataDirNet() / "llmq" / "quorumdb"), 1 << 20,
-                                    unit_tests, wipe)},
+                               const CSporkManager& sporkman, const util::DbWrapperParams& db_params) :
+    db{util::MakeDbWrapper(
+        {db_params.path / "llmq" / "quorumdb", db_params.memory, db_params.wipe, /*cache_size=*/1 << 20})},
     blsWorker{_blsWorker},
     m_chainstate{chainstate},
     m_dmnman{dmnman},
diff --git a/src/llmq/quorums.h b/src/llmq/quorums.h
@@ -37,6 +37,9 @@ class CEvoDB;
 class CMasternodeSync;
 class CNode;
 class CSporkManager;
+namespace util {
+struct DbWrapperParams;
+} // namespace util
 
 namespace llmq
 {
@@ -263,9 +266,10 @@ class CQuorumManager
     CQuorumManager(const CQuorumManager&) = delete;
     CQuorumManager& operator=(const CQuorumManager&) = delete;
     explicit CQuorumManager(CBLSWorker& _blsWorker, CChainState& chainstate, CDeterministicMNManager& dmnman,
-                            CDKGSessionManager& _dkgManager, CEvoDB& _evoDb, CQuorumBlockProcessor& _quorumBlockProcessor,
-                            CQuorumSnapshotManager& qsnapman, const CActiveMasternodeManager* const mn_activeman,
-                            const CMasternodeSync& mn_sync, const CSporkManager& sporkman, bool unit_tests, bool wipe);
+                            CDKGSessionManager& _dkgManager, CEvoDB& _evoDb,
+                            CQuorumBlockProcessor& _quorumBlockProcessor, CQuorumSnapshotManager& qsnapman,
+                            const CActiveMasternodeManager* const mn_activeman, const CMasternodeSync& mn_sync,
+                            const CSporkManager& sporkman, const util::DbWrapperParams& db_params);
     ~CQuorumManager();
 
     void Start();
diff --git a/src/llmq/signing.cpp b/src/llmq/signing.cpp
@@ -27,8 +27,8 @@
 
 namespace llmq
 {
-CRecoveredSigsDb::CRecoveredSigsDb(bool fMemory, bool fWipe) :
-        db(std::make_unique<CDBWrapper>(fMemory ? "" : (gArgs.GetDataDirNet() / "llmq/recsigdb"), 8 << 20, fMemory, fWipe))
+CRecoveredSigsDb::CRecoveredSigsDb(const util::DbWrapperParams& db_params) :
+    db{util::MakeDbWrapper({db_params.path / "llmq" / "recsigdb", db_params.memory, db_params.wipe, /*cache_size=*/8 << 20})}
 {
 }
 
@@ -332,8 +332,9 @@ void CRecoveredSigsDb::CleanupOldVotes(int64_t maxAge)
 
 //////////////////
 
-CSigningManager::CSigningManager(const CChainState& chainstate, const CQuorumManager& _qman, bool fMemory, bool fWipe) :
-    db{fMemory, fWipe},
+CSigningManager::CSigningManager(const CChainState& chainstate, const CQuorumManager& _qman,
+                                 const util::DbWrapperParams& db_params) :
+    db{db_params},
     m_chainstate{chainstate},
     qman{_qman}
 {
diff --git a/src/llmq/signing.h b/src/llmq/signing.h
@@ -32,6 +32,9 @@ class CDBWrapper;
 class CInv;
 class PeerManager;
 struct RPCResult;
+namespace util {
+struct DbWrapperParams;
+} // namespace util
 
 class UniValue;
 
@@ -124,7 +127,7 @@ class CRecoveredSigsDb
     mutable Uint256LruHashMap<bool, 30000> hasSigForHashCache GUARDED_BY(cs_cache);
 
 public:
-    explicit CRecoveredSigsDb(bool fMemory, bool fWipe);
+    explicit CRecoveredSigsDb(const util::DbWrapperParams& db_params);
     ~CRecoveredSigsDb();
 
     bool HasRecoveredSig(Consensus::LLMQType llmqType, const uint256& id, const uint256& msgHash) const;
@@ -183,7 +186,8 @@ class CSigningManager
     CSigningManager() = delete;
     CSigningManager(const CSigningManager&) = delete;
     CSigningManager& operator=(const CSigningManager&) = delete;
-    explicit CSigningManager(const CChainState& chainstate, const CQuorumManager& _qman, bool fMemory, bool fWipe);
+    explicit CSigningManager(const CChainState& chainstate, const CQuorumManager& _qman,
+                             const util::DbWrapperParams& db_params);
     ~CSigningManager();
 
     bool AlreadyHave(const CInv& inv) const EXCLUSIVE_LOCKS_REQUIRED(!cs_pending);
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
@@ -48,6 +48,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
                                                      std::unique_ptr<CMNHFManager>& mnhf_manager,
                                                      std::unique_ptr<LLMQContext>& llmq_ctx,
                                                      CTxMemPool* mempool,
+                                                     const fs::path& data_dir,
                                                      bool fPruneMode,
                                                      bool is_addrindex_enabled,
                                                      bool is_governance_enabled,
@@ -72,7 +73,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
     LOCK(cs_main);
 
     evodb.reset();
-    evodb = std::make_unique<CEvoDB>(/*fMemory=*/false, /*fWipe=*/fReset || fReindexChainState);
+    evodb = std::make_unique<CEvoDB>(util::DbWrapperParams{.path = data_dir, .memory = false, .wipe = fReset || fReindexChainState});
 
     mnhf_manager.reset();
     mnhf_manager = std::make_unique<CMNHFManager>(*evodb);
@@ -88,7 +89,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
     pblocktree.reset(new CBlockTreeDB(nBlockTreeDBCache, block_tree_db_in_memory, fReset));
 
     DashChainstateSetup(chainman, govman, mn_metaman, mn_sync, sporkman, mn_activeman, chain_helper, cpoolman,
-                        dmnman, evodb, mnhf_manager, llmq_ctx, mempool, fReset, fReindexChainState,
+                        dmnman, evodb, mnhf_manager, llmq_ctx, mempool, data_dir, fReset, fReindexChainState,
                         consensus_params);
 
     if (fReset) {
@@ -228,6 +229,7 @@ void DashChainstateSetup(ChainstateManager& chainman,
                          std::unique_ptr<CMNHFManager>& mnhf_manager,
                          std::unique_ptr<LLMQContext>& llmq_ctx,
                          CTxMemPool* mempool,
+                         const fs::path& data_dir,
                          bool fReset,
                          bool fReindexChainState,
                          const Consensus::Params& consensus_params)
@@ -245,7 +247,8 @@ void DashChainstateSetup(ChainstateManager& chainman,
     }
     llmq_ctx.reset();
     llmq_ctx = std::make_unique<LLMQContext>(chainman, *dmnman, *evodb, mn_metaman, *mnhf_manager, sporkman,
-                                             *mempool, mn_activeman.get(), mn_sync, /*unit_tests=*/false, /*wipe=*/fReset || fReindexChainState);
+                                             *mempool, mn_activeman.get(), mn_sync,
+                                             util::DbWrapperParams{.path = data_dir, .memory = false, .wipe = fReset || fReindexChainState});
     mempool->ConnectManagers(dmnman.get(), llmq_ctx->isman.get());
     // Enable CMNHFManager::{Process, Undo}Block
     mnhf_manager->ConnectManagers(&chainman, llmq_ctx->qman.get());
diff --git a/src/node/chainstate.h b/src/node/chainstate.h
@@ -27,7 +27,10 @@ struct LLMQContext;
 
 namespace Consensus {
 struct Params;
-}
+} // namespace Consensus
+namespace fs {
+class path;
+} // namespace fs
 
 namespace node {
 enum class ChainstateLoadingError {
@@ -90,6 +93,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
                                                      std::unique_ptr<CMNHFManager>& mnhf_manager,
                                                      std::unique_ptr<LLMQContext>& llmq_ctx,
                                                      CTxMemPool* mempool,
+                                                     const fs::path& data_dir,
                                                      bool fPruneMode,
                                                      bool is_addrindex_enabled,
                                                      bool is_governance_enabled,
@@ -121,6 +125,7 @@ void DashChainstateSetup(ChainstateManager& chainman,
                          std::unique_ptr<CMNHFManager>& mnhf_manager,
                          std::unique_ptr<LLMQContext>& llmq_ctx,
                          CTxMemPool* mempool,
+                         const fs::path& data_dir,
                          bool fReset,
                          bool fReindexChainState,
                          const Consensus::Params& consensus_params);
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
