From ad35c1ab2f3046b95c5cd85fa1c6ba086cb993e3 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Wed, 18 Sep 2024 17:42:54 +0300 Subject: [PATCH] apply suggestions --- src/llmq/quorums.cpp | 28 +++++++++++++++------------- src/llmq/quorums.h | 4 ++-- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp index 2b6b084ae9bf1..6fc79b82a1cb0 100644 --- a/src/llmq/quorums.cpp +++ b/src/llmq/quorums.cpp @@ -164,7 +164,7 @@ int CQuorum::GetMemberIndex(const uint256& proTxHash) const return -1; } -void CQuorum::WriteContributions(const std::unique_ptr& db) const +void CQuorum::WriteContributions(CDBWrapper& db) const { uint256 dbKey = MakeQuorumKey(*this); @@ -175,19 +175,19 @@ void CQuorum::WriteContributions(const std::unique_ptr& db) const for (auto& pubkey : *quorumVvec) { s << CBLSPublicKeyVersionWrapper(pubkey, false); } - db->Write(std::make_pair(DB_QUORUM_QUORUM_VVEC, dbKey), s); + db.Write(std::make_pair(DB_QUORUM_QUORUM_VVEC, dbKey), s); } if (skShare.IsValid()) { - db->Write(std::make_pair(DB_QUORUM_SK_SHARE, dbKey), skShare); + db.Write(std::make_pair(DB_QUORUM_SK_SHARE, dbKey), skShare); } } -bool CQuorum::ReadContributions(const std::unique_ptr& db) +bool CQuorum::ReadContributions(const CDBWrapper& db) { uint256 dbKey = MakeQuorumKey(*this); CDataStream s(SER_DISK, CLIENT_VERSION); - if (!db->ReadDataStream(std::make_pair(DB_QUORUM_QUORUM_VVEC, dbKey), s)) { + if (!db.ReadDataStream(std::make_pair(DB_QUORUM_QUORUM_VVEC, dbKey), s)) { return false; } @@ -203,7 +203,7 @@ bool CQuorum::ReadContributions(const std::unique_ptr& db) quorumVvec = std::make_shared>(std::move(qv)); // We ignore the return value here as it is ok if this fails. If it fails, it usually means that we are not a // member of the quorum but observed the whole DKG process to have the quorum verification vector. - db->Read(std::make_pair(DB_QUORUM_SK_SHARE, dbKey), skShare); + db.Read(std::make_pair(DB_QUORUM_SK_SHARE, dbKey), skShare); return true; } @@ -213,7 +213,8 @@ CQuorumManager::CQuorumManager(CBLSWorker& _blsWorker, CChainState& chainstate, CQuorumBlockProcessor& _quorumBlockProcessor, const CActiveMasternodeManager* const mn_activeman, const CMasternodeSync& mn_sync, const CSporkManager& sporkman, bool unit_tests, bool wipe) : - db(std::make_unique(unit_tests ? "" : (gArgs.GetDataDirNet() / "llmq/quorumdb"), 1 << 20, unit_tests, wipe)), + db(std::make_unique(unit_tests ? "" : (gArgs.GetDataDirNet() / "llmq" / "quorumdb"), 1 << 20, + unit_tests, wipe)), blsWorker(_blsWorker), m_chainstate(chainstate), connman(_connman), @@ -407,11 +408,11 @@ CQuorumPtr CQuorumManager::BuildQuorumFromCommitment(const Consensus::LLMQType l quorum->Init(std::move(qc), pQuorumBaseBlockIndex, minedBlockHash, members); bool hasValidVvec = false; - if (WITH_LOCK(cs_db, return quorum->ReadContributions(db))) { + if (WITH_LOCK(cs_db, return quorum->ReadContributions(*db))) { hasValidVvec = true; } else { if (BuildQuorumContributions(quorum->qc, quorum)) { - WITH_LOCK(cs_db, quorum->WriteContributions(db)); + WITH_LOCK(cs_db, quorum->WriteContributions(*db)); hasValidVvec = true; } else { LogPrint(BCLog::LLMQ, "CQuorumManager::%s -- llmqType[%d] quorumIndex[%d] quorum.ReadContributions and BuildQuorumContributions for quorumHash[%s] failed\n", __func__, ToUnderlying(llmqType), quorum->qc->quorumIndex, quorum->qc->quorumHash.ToString()); @@ -849,7 +850,7 @@ PeerMsgRet CQuorumManager::ProcessMessage(CNode& pfrom, const std::string& msg_t return errorHandler("Invalid secret key share received"); } } - WITH_LOCK(cs_db, pQuorum->WriteContributions(db)); + WITH_LOCK(cs_db, pQuorum->WriteContributions(*db)); return {}; } return {}; @@ -1110,6 +1111,7 @@ void CQuorumManager::StartCleanupOldQuorumDataThread(const CBlockIndex* pIndex) }); } +// TODO: remove in v23 void CQuorumManager::MigrateOldQuorumDB(CEvoDB& evoDb) const { LOCK(cs_db); @@ -1117,7 +1119,7 @@ void CQuorumManager::MigrateOldQuorumDB(CEvoDB& evoDb) const const auto prefixes = {DB_QUORUM_QUORUM_VVEC, DB_QUORUM_SK_SHARE}; - LogPrint(BCLog::LLMQ, "CQuorumManager::%d -- start\n", __func__); + LogPrint(BCLog::LLMQ, "CQuorumManager::%s -- start\n", __func__); CDBBatch batch(*db); std::unique_ptr pcursor(evoDb.GetRawDB().NewIterator()); @@ -1160,7 +1162,7 @@ void CQuorumManager::MigrateOldQuorumDB(CEvoDB& evoDb) const db->WriteBatch(batch); - LogPrint(BCLog::LLMQ, "CQuorumManager::%d -- %s moved %d\n", __func__, prefix, count); + LogPrint(BCLog::LLMQ, "CQuorumManager::%s -- %s moved %d\n", __func__, prefix, count); } pcursor.reset(); @@ -1169,7 +1171,7 @@ void CQuorumManager::MigrateOldQuorumDB(CEvoDB& evoDb) const DataCleanupHelper(evoDb.GetRawDB(), {}); evoDb.CommitRootTransaction(); - LogPrint(BCLog::LLMQ, "CQuorumManager::%d -- done\n", __func__); + LogPrint(BCLog::LLMQ, "CQuorumManager::%s -- done\n", __func__); } CQuorumCPtr SelectQuorumForSigning(const Consensus::LLMQParams& llmq_params, const CChain& active_chain, const CQuorumManager& qman, diff --git a/src/llmq/quorums.h b/src/llmq/quorums.h index ca7e45c1c520a..be377e357ff65 100644 --- a/src/llmq/quorums.h +++ b/src/llmq/quorums.h @@ -217,8 +217,8 @@ class CQuorum private: bool HasVerificationVectorInternal() const EXCLUSIVE_LOCKS_REQUIRED(cs_vvec_shShare); - void WriteContributions(const std::unique_ptr& db) const; - bool ReadContributions(const std::unique_ptr& db); + void WriteContributions(CDBWrapper& db) const; + bool ReadContributions(const CDBWrapper& db); }; /**