From 82238e6be238142a2a834984d4afb0a7c02b9f33 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Thu, 28 Nov 2024 18:24:44 +0300 Subject: [PATCH] refactor: Set log level in `LogAcceptCategory()` to `Debug` by default --- src/llmq/commitment.cpp | 6 +++--- src/llmq/dkgsession.cpp | 4 ++-- src/llmq/instantsend.cpp | 4 ++-- src/llmq/signing_shares.cpp | 2 +- src/llmq/utils.cpp | 12 ++++++------ src/logging.h | 2 +- src/qt/coincontroldialog.cpp | 2 +- src/wallet/wallet.cpp | 4 ++-- src/wallet/wallet.h | 10 +++++----- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/llmq/commitment.cpp b/src/llmq/commitment.cpp index 05607c34a6a79..ea131b113c271 100644 --- a/src/llmq/commitment.cpp +++ b/src/llmq/commitment.cpp @@ -82,7 +82,7 @@ bool CFinalCommitment::Verify(CDeterministicMNManager& dmnman, gsl::not_nullproTxHash.ToString().substr(0, 4) << " | "; @@ -181,7 +181,7 @@ bool CheckLLMQCommitment(CDeterministicMNManager& dmnman, const ChainstateManage return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-qc-commitment-type"); } - if (LogAcceptCategory(BCLog::LLMQ, BCLog::Level::Debug)) { + if (LogAcceptCategory(BCLog::LLMQ)) { std::stringstream ss; for (const auto i: irange::range(llmq_params_opt->size)) { ss << "v[" << i << "]=" << qcTx.commitment.validMembers[i]; diff --git a/src/llmq/dkgsession.cpp b/src/llmq/dkgsession.cpp index 1c95881efe34f..fe695354a6151 100644 --- a/src/llmq/dkgsession.cpp +++ b/src/llmq/dkgsession.cpp @@ -120,7 +120,7 @@ bool CDKGSession::Init(const uint256& _myProTxHash, int _quorumIndex) CDKGLogger logger(*this, __func__, __LINE__); - if (LogAcceptCategory(BCLog::LLMQ, BCLog::Level::Debug) && IsQuorumRotationEnabled(params, m_quorum_base_block_index)) { + if (LogAcceptCategory(BCLog::LLMQ) && IsQuorumRotationEnabled(params, m_quorum_base_block_index)) { int cycleQuorumBaseHeight = m_quorum_base_block_index->nHeight - quorumIndex; const CBlockIndex* pCycleQuorumBaseBlockIndex = m_quorum_base_block_index->GetAncestor(cycleQuorumBaseHeight); std::stringstream ss; @@ -138,7 +138,7 @@ bool CDKGSession::Init(const uint256& _myProTxHash, int _quorumIndex) if (!myProTxHash.IsNull()) { dkgDebugManager.InitLocalSessionStatus(params, quorumIndex, m_quorum_base_block_index->GetBlockHash(), m_quorum_base_block_index->nHeight); relayMembers = utils::GetQuorumRelayMembers(params, m_dmnman, m_quorum_base_block_index, myProTxHash, true); - if (LogAcceptCategory(BCLog::LLMQ, BCLog::Level::Debug)) { + if (LogAcceptCategory(BCLog::LLMQ)) { std::stringstream ss; for (const auto& r : relayMembers) { ss << r.ToString().substr(0, 4) << " | "; diff --git a/src/llmq/instantsend.cpp b/src/llmq/instantsend.cpp index 598986b55b56b..935795672ddec 100644 --- a/src/llmq/instantsend.cpp +++ b/src/llmq/instantsend.cpp @@ -639,7 +639,7 @@ void CInstantSendManager::HandleNewInputLockRecoveredSig(const CRecoveredSig& re return; } - if (LogAcceptCategory(BCLog::INSTANTSEND, BCLog::Level::Debug)) { + if (LogAcceptCategory(BCLog::INSTANTSEND)) { for (const auto& in : tx->vin) { auto id = ::SerializeHash(std::make_pair(INPUTLOCK_REQUESTID_PREFIX, in.prevout)); if (id == recoveredSig.getId()) { @@ -1469,7 +1469,7 @@ void CInstantSendManager::ProcessPendingRetryLockTxs() // CheckCanLock is already called by ProcessTx, so we should avoid calling it twice. But we also shouldn't spam // the logs when retrying TXs that are not ready yet. - if (LogAcceptCategory(BCLog::INSTANTSEND, BCLog::Level::Debug)) { + if (LogAcceptCategory(BCLog::INSTANTSEND)) { if (!CheckCanLock(*tx, false, Params().GetConsensus())) { continue; } diff --git a/src/llmq/signing_shares.cpp b/src/llmq/signing_shares.cpp index 6cfb8d16554d0..08e068ee2cf68 100644 --- a/src/llmq/signing_shares.cpp +++ b/src/llmq/signing_shares.cpp @@ -1334,7 +1334,7 @@ void CSigSharesManager::Cleanup() const auto& oneSigShare = m->begin()->second; std::string strMissingMembers; - if (LogAcceptCategory(BCLog::LLMQ_SIGS, BCLog::Level::Debug)) { + if (LogAcceptCategory(BCLog::LLMQ_SIGS)) { if (const auto quorumIt = quorums.find(std::make_pair(oneSigShare.getLlmqType(), oneSigShare.getQuorumHash())); quorumIt != quorums.end()) { const auto& quorum = quorumIt->second; for (const auto i : irange::range(quorum->members.size())) { diff --git a/src/llmq/utils.cpp b/src/llmq/utils.cpp index 59147750ee657..fe1fb2a1d989e 100644 --- a/src/llmq/utils.cpp +++ b/src/llmq/utils.cpp @@ -216,7 +216,7 @@ std::vector> ComputeQuorumMembersByQuarterRota //TODO Check if it is triggered from outside (P2P, block validation). Throwing an exception is probably a wiser choice //assert (!newQuarterMembers.empty()); - if (LogAcceptCategory(BCLog::LLMQ, BCLog::Level::Debug)) { + if (LogAcceptCategory(BCLog::LLMQ)) { for (const size_t i : irange::range(nQuorums)) { std::stringstream ss; @@ -249,7 +249,7 @@ std::vector> ComputeQuorumMembersByQuarterRota std::move(previousQuarters.quarterHMinusC[i].begin(), previousQuarters.quarterHMinusC[i].end(), std::back_inserter(quorumMembers[i])); std::move(newQuarterMembers[i].begin(), newQuarterMembers[i].end(), std::back_inserter(quorumMembers[i])); - if (LogAcceptCategory(BCLog::LLMQ, BCLog::Level::Debug)) { + if (LogAcceptCategory(BCLog::LLMQ)) { std::stringstream ss; ss << " ["; for (const auto &m: quorumMembers[i]) { @@ -397,7 +397,7 @@ std::vector> BuildNewQuorumQuarterMembers(cons sortedCombinedMnsList.push_back(std::move(m)); } - if (LogAcceptCategory(BCLog::LLMQ, BCLog::Level::Debug)) { + if (LogAcceptCategory(BCLog::LLMQ)) { std::stringstream ss; ss << " ["; for (const auto &m: sortedCombinedMnsList) { @@ -517,7 +517,7 @@ std::vector> GetQuorumQuarterMembersBySnapshot std::move(sortedMnsUsedAtH.begin(), sortedMnsUsedAtH.end(), std::back_inserter(sortedCombinedMns)); } - if (LogAcceptCategory(BCLog::LLMQ, BCLog::Level::Debug)) { + if (LogAcceptCategory(BCLog::LLMQ)) { std::stringstream ss; ss << " ["; for (const auto &m: sortedCombinedMns) { @@ -789,7 +789,7 @@ bool EnsureQuorumConnections(const Consensus::LLMQParams& llmqParams, CConnman& } if (!connections.empty()) { if (!connman.HasMasternodeQuorumNodes(llmqParams.type, pQuorumBaseBlockIndex->GetBlockHash()) && - LogAcceptCategory(BCLog::LLMQ, BCLog::Level::Debug)) { + LogAcceptCategory(BCLog::LLMQ)) { std::string debugMsg = strprintf("%s -- adding masternodes quorum connections for quorum %s:\n", __func__, pQuorumBaseBlockIndex->GetBlockHash().ToString()); for (const auto& c : connections) { auto dmn = tip_mn_list.GetValidMN(c); @@ -836,7 +836,7 @@ void AddQuorumProbeConnections(const Consensus::LLMQParams& llmqParams, CConnman } if (!probeConnections.empty()) { - if (LogAcceptCategory(BCLog::LLMQ, BCLog::Level::Debug)) { + if (LogAcceptCategory(BCLog::LLMQ)) { std::string debugMsg = strprintf("%s -- adding masternodes probes for quorum %s:\n", __func__, pQuorumBaseBlockIndex->GetBlockHash().ToString()); for (const auto& c : probeConnections) { auto dmn = tip_mn_list.GetValidMN(c); diff --git a/src/logging.h b/src/logging.h index a8d5453047bd4..8e8574ea29b01 100644 --- a/src/logging.h +++ b/src/logging.h @@ -226,7 +226,7 @@ namespace BCLog { BCLog::Logger& LogInstance(); /** Return true if log accepts specified category, at the specified level. */ -static inline bool LogAcceptCategory(BCLog::LogFlags category, BCLog::Level level) +static inline bool LogAcceptCategory(BCLog::LogFlags category, BCLog::Level level = BCLog::Level::Debug) { return LogInstance().WillLogCategoryLevel(category, level); } diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 4c89d8314e172..4ada490a7a618 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -770,7 +770,7 @@ void CoinControlDialog::updateView() // CoinJoin rounds int nRounds = model->getRealOutpointCoinJoinRounds(output); - if (nRounds >= 0 || LogAcceptCategory(BCLog::COINJOIN, BCLog::Level::Debug)) { + if (nRounds >= 0 || LogAcceptCategory(BCLog::COINJOIN)) { itemOutput->setText(COLUMN_COINJOIN_ROUNDS, QString::number(nRounds)); } else { itemOutput->setText(COLUMN_COINJOIN_ROUNDS, tr("n/a")); diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 4a27f58305710..832840db595b2 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3432,11 +3432,11 @@ std::vector CWallet::SelectCoinsGroupedByAddresses(bool fSkipD } // debug - if (LogAcceptCategory(BCLog::SELECTCOINS, BCLog::Level::Debug)) { + if (LogAcceptCategory(BCLog::SELECTCOINS)) { std::string strMessage = "SelectCoinsGroupedByAddresses - vecTallyRet:\n"; for (const auto& item : vecTallyRet) strMessage += strprintf(" %s %f\n", EncodeDestination(item.txdest), float(item.nAmount)/COIN); - LogPrint(BCLog::SELECTCOINS, "%s", strMessage); /* Continued */ + LogPrintf("%s", strMessage); /* Continued */ } return vecTallyRet; diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 9538e877c98c4..49c8b96a515d5 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -150,11 +150,11 @@ extern const std::map WALLET_FLAG_CAVEATS; // Use a macro instead of a function for conditional logging to prevent // evaluating arguments when logging for the category is not enabled. -#define WalletCJLogPrint(wallet, ...) \ - do { \ - if (LogAcceptCategory(BCLog::COINJOIN, BCLog::Level::Debug)) { \ - wallet->WalletLogPrintf(__VA_ARGS__); \ - } \ +#define WalletCJLogPrint(wallet, ...) \ + do { \ + if (LogAcceptCategory(BCLog::COINJOIN)) { \ + wallet->WalletLogPrintf(__VA_ARGS__); \ + } \ } while (0) /** A wrapper to reserve an address from a wallet