mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 19:42:46 +01:00
refactor: Set log level in LogAcceptCategory()
to Debug
by default
This commit is contained in:
parent
89ca1ae104
commit
82238e6be2
@ -82,7 +82,7 @@ bool CFinalCommitment::Verify(CDeterministicMNManager& dmnman, gsl::not_null<con
|
||||
return false;
|
||||
}
|
||||
auto members = utils::GetAllQuorumMembers(llmqType, dmnman, pQuorumBaseBlockIndex);
|
||||
if (LogAcceptCategory(BCLog::LLMQ, BCLog::Level::Debug)) {
|
||||
if (LogAcceptCategory(BCLog::LLMQ)) {
|
||||
std::stringstream ss;
|
||||
std::stringstream ss2;
|
||||
for (const auto i: irange::range(llmq_params.size)) {
|
||||
@ -106,7 +106,7 @@ bool CFinalCommitment::Verify(CDeterministicMNManager& dmnman, gsl::not_null<con
|
||||
// sigs are only checked when the block is processed
|
||||
if (checkSigs) {
|
||||
uint256 commitmentHash = BuildCommitmentHash(llmq_params.type, quorumHash, validMembers, quorumPublicKey, quorumVvecHash);
|
||||
if (LogAcceptCategory(BCLog::LLMQ, BCLog::Level::Debug)) {
|
||||
if (LogAcceptCategory(BCLog::LLMQ)) {
|
||||
std::stringstream ss3;
|
||||
for (const auto &mn: members) {
|
||||
ss3 << mn->proTxHash.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];
|
||||
|
@ -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) << " | ";
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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())) {
|
||||
|
@ -216,7 +216,7 @@ std::vector<std::vector<CDeterministicMNCPtr>> 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<std::vector<CDeterministicMNCPtr>> 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<std::vector<CDeterministicMNCPtr>> 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<std::vector<CDeterministicMNCPtr>> 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);
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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"));
|
||||
|
@ -3432,11 +3432,11 @@ std::vector<CompactTallyItem> 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;
|
||||
|
@ -150,11 +150,11 @@ extern const std::map<uint64_t,std::string> 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
|
||||
|
Loading…
Reference in New Issue
Block a user