Skip to content

Commit d5ebfb1

Browse files
kwvgkwvg
committed
lint: apply most clang-format suggestions, update circular allowlist
1 parent b32dc9d commit d5ebfb1

File tree

5 files changed

+49
-33
lines changed

5 files changed

+49
-33
lines changed

‎src/governance/governance.cpp‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@ void CGovernanceManager::AddPostponedObject(const CGovernanceObject& govobj)
210210
mapPostponedObjects.emplace(govobj.GetHash(), govobj);
211211
}
212212

213-
MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv)
213+
MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
214+
CDataStream& vRecv)
214215
{
215216
AssertLockNotHeld(cs_relay);
216217
if (!IsValid()) return {};
@@ -942,7 +943,8 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
942943
std::string msg{strprintf("CGovernanceManager::%s -- Unknown parent object %s, MN outpoint = %s", __func__,
943944
nHashGovobj.ToString(), vote.GetMasternodeOutpoint().ToStringShort())};
944945
exception = CGovernanceException(msg, GOVERNANCE_EXCEPTION_WARNING);
945-
if (cmmapOrphanVotes.Insert(nHashGovobj, vote_time_pair_t(vote, count_seconds(GetTime<std::chrono::seconds>() + GOVERNANCE_ORPHAN_EXPIRATION_TIME)))) {
946+
if (cmmapOrphanVotes.Insert(nHashGovobj, vote_time_pair_t(vote, count_seconds(GetTime<std::chrono::seconds>() +
947+
GOVERNANCE_ORPHAN_EXPIRATION_TIME)))) {
946948
LEAVE_CRITICAL_SECTION(cs);
947949
RequestGovernanceObject(pfrom, nHashGovobj, connman);
948950
LogPrint(BCLog::GOBJECT, "%s\n", msg);
@@ -1013,8 +1015,10 @@ void CGovernanceManager::CheckPostponedObjects()
10131015

10141016
int64_t nTimestamp = govobj.GetCreationTime();
10151017

1016-
bool fValid = (nTimestamp <= nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION)) && (nTimestamp >= nNow - 2 * nSuperblockCycleSeconds);
1017-
bool fReady = (nTimestamp <= nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION) - count_seconds(RELIABLE_PROPAGATION_TIME));
1018+
bool fValid = (nTimestamp <= nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION)) &&
1019+
(nTimestamp >= nNow - 2 * nSuperblockCycleSeconds);
1020+
bool fReady = (nTimestamp <=
1021+
nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION) - count_seconds(RELIABLE_PROPAGATION_TIME));
10181022

10191023
if (fValid) {
10201024
if (fReady) {
@@ -1632,8 +1636,8 @@ bool CGovernanceManager::GetBestSuperblock(const CDeterministicMNList& tip_mn_li
16321636
return InternalGetBestSuperblock(tip_mn_list, pSuperblockRet, nBlockHeight);
16331637
}
16341638

1635-
bool CGovernanceManager::InternalGetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
1636-
int nBlockHeight)
1639+
bool CGovernanceManager::InternalGetBestSuperblock(const CDeterministicMNList& tip_mn_list,
1640+
CSuperblock_sptr& pSuperblockRet, int nBlockHeight)
16371641
{
16381642
if (!CSuperblock::IsValidBlockHeight(nBlockHeight)) {
16391643
return false;
@@ -1738,7 +1742,8 @@ void CGovernanceManager::ExecuteBestSuperblock(const CDeterministicMNList& tip_m
17381742
}
17391743
}
17401744

1741-
std::vector<std::shared_ptr<const CGovernanceObject>> CGovernanceManager::GetApprovedProposals(const CDeterministicMNList& tip_mn_list)
1745+
std::vector<std::shared_ptr<const CGovernanceObject>> CGovernanceManager::GetApprovedProposals(
1746+
const CDeterministicMNList& tip_mn_list)
17421747
{
17431748
AssertLockNotHeld(cs);
17441749

‎src/governance/governance.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
296296
[[nodiscard]] MessageProcessingResult SyncSingleObjVotes(CNode& peer, const uint256& nProp, const CBloomFilter& filter, CConnman& connman);
297297
[[nodiscard]] MessageProcessingResult SyncObjects(CNode& peer, CConnman& connman) const;
298298

299-
[[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv)
300-
EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
299+
[[nodiscard]] MessageProcessingResult ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
300+
CDataStream& vRecv) EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
301301

302302
const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
303303
CGovernanceObject* FindGovernanceObject(const uint256& nHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
@@ -386,8 +386,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
386386
bool IsValidSuperblock(const CChain& active_chain, const CDeterministicMNList& tip_mn_list,
387387
const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
388388

389-
bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet, int nBlockHeight) override
390-
EXCLUSIVE_LOCKS_REQUIRED(!cs);
389+
bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
390+
int nBlockHeight) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
391391

392392
std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) override
393393
EXCLUSIVE_LOCKS_REQUIRED(!cs);
@@ -396,8 +396,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
396396
//! Internal functions that require locks to be held
397397
CGovernanceObject* InternalFindGovernanceObject(const uint256& nHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
398398
std::vector<std::shared_ptr<CSuperblock>> InternalGetActiveTriggers() const EXCLUSIVE_LOCKS_REQUIRED(cs);
399-
bool InternalGetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet, int nBlockHeight)
400-
EXCLUSIVE_LOCKS_REQUIRED(cs);
399+
bool InternalGetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
400+
int nBlockHeight) EXCLUSIVE_LOCKS_REQUIRED(cs);
401401

402402
void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight);
403403

‎src/governance/signing.cpp‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ std::optional<const CSuperblock> GovernanceSigner::CreateSuperblockCandidate(int
4040
{
4141
if (!m_govman.IsValid()) return std::nullopt;
4242
if (!m_mn_sync.IsSynced()) return std::nullopt;
43-
if (nHeight % Params().GetConsensus().nSuperblockCycle < Params().GetConsensus().nSuperblockCycle - Params().GetConsensus().nSuperblockMaturityWindow) return std::nullopt;
43+
if (nHeight % Params().GetConsensus().nSuperblockCycle <
44+
Params().GetConsensus().nSuperblockCycle - Params().GetConsensus().nSuperblockMaturityWindow)
45+
return std::nullopt;
4446
if (HasAlreadyVotedFundingTrigger()) return std::nullopt;
4547

4648
const auto approvedProposals = m_govman.GetApprovedProposals(m_dmnman.GetListAtChainTip());
@@ -54,7 +56,8 @@ std::optional<const CSuperblock> GovernanceSigner::CreateSuperblockCandidate(int
5456
int nNextSuperblock;
5557

5658
CSuperblock::GetNearestSuperblocksHeights(nHeight, nLastSuperblock, nNextSuperblock);
57-
auto SBEpochTime = static_cast<int64_t>(GetTime<std::chrono::seconds>().count() + (nNextSuperblock - nHeight) * 2.62 * 60);
59+
auto SBEpochTime = static_cast<int64_t>(GetTime<std::chrono::seconds>().count() +
60+
(nNextSuperblock - nHeight) * 2.62 * 60);
5861
auto governanceBudget = CSuperblock::GetPaymentsLimit(m_chainman.ActiveChain(), nNextSuperblock);
5962

6063
CAmount budgetAllocated{};
@@ -68,9 +71,8 @@ std::optional<const CSuperblock> GovernanceSigner::CreateSuperblockCandidate(int
6871
CAmount nAmount{};
6972
try {
7073
nAmount = ParsePaymentAmount(jproposal["payment_amount"].getValStr());
71-
}
72-
catch (const std::runtime_error& e) {
73-
LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d Skipping payment exception:%s\n", __func__,nHeight, e.what());
74+
} catch (const std::runtime_error& e) {
75+
LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d Skipping payment exception:%s\n", __func__, nHeight, e.what());
7476
continue;
7577
}
7678

@@ -86,11 +88,12 @@ std::optional<const CSuperblock> GovernanceSigner::CreateSuperblockCandidate(int
8688

8789
// Skip proposals if the SB isn't within the proposal time window
8890
if (SBEpochTime < windowStart) {
89-
LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d SB:%d windowStart:%d\n", __func__,nHeight, SBEpochTime, windowStart);
91+
LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d SB:%d windowStart:%d\n", __func__, nHeight, SBEpochTime,
92+
windowStart);
9093
continue;
9194
}
9295
if (SBEpochTime > windowEnd) {
93-
LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d SB:%d windowEnd:%d\n", __func__,nHeight, SBEpochTime, windowEnd);
96+
LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d SB:%d windowEnd:%d\n", __func__, nHeight, SBEpochTime, windowEnd);
9497
continue;
9598
}
9699

@@ -121,7 +124,7 @@ std::optional<const CGovernanceObject> GovernanceSigner::CreateGovernanceTrigger
121124
// no sb_opt, no trigger
122125
if (!sb_opt.has_value()) return std::nullopt;
123126

124-
//TODO: Check if nHashParentIn, nRevision and nCollateralHashIn are correct
127+
// TODO: Check if nHashParentIn, nRevision and nCollateralHashIn are correct
125128
LOCK(::cs_main);
126129

127130
// Check if identical trigger (equal DataHash()) is already created (signed by other masternode)
@@ -132,7 +135,7 @@ std::optional<const CGovernanceObject> GovernanceSigner::CreateGovernanceTrigger
132135
}
133136

134137
// Nobody submitted a trigger we'd like to see, so let's do it but only if we are the payee
135-
const CBlockIndex *tip = WITH_LOCK(::cs_main, return m_chainman.ActiveChain().Tip());
138+
const CBlockIndex* tip = WITH_LOCK(::cs_main, return m_chainman.ActiveChain().Tip());
136139
const auto mnList = m_dmnman.GetListForBlock(tip);
137140
const auto mn_payees = mnList.GetProjectedMNPayees(tip);
138141

@@ -154,7 +157,8 @@ std::optional<const CGovernanceObject> GovernanceSigner::CreateGovernanceTrigger
154157
}
155158

156159
if (!m_govman.MasternodeRateCheck(gov_sb)) {
157-
LogPrint(BCLog::GOBJECT, "%s -- Trigger rejected because of rate check failure hash(%s)\n", __func__, gov_sb.GetHash().ToString());
160+
LogPrint(BCLog::GOBJECT, "%s -- Trigger rejected because of rate check failure hash(%s)\n", __func__,
161+
gov_sb.GetHash().ToString());
158162
return std::nullopt;
159163
}
160164

@@ -221,21 +225,23 @@ void GovernanceSigner::VoteGovernanceTriggers(const std::optional<const CGoverna
221225
const uint256 trigger_hash = govobj->GetHash();
222226
if (trigger->GetBlockHeight() <= m_govman.GetCachedBlockHeight()) {
223227
// ignore triggers from the past
224-
LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for outdated trigger:%s\n", __func__, trigger_hash.ToString());
228+
LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for outdated trigger:%s\n", __func__,
229+
trigger_hash.ToString());
225230
continue;
226231
}
227232
if (trigger_hash == votedFundingYesTriggerHash) {
228233
// Skip actual trigger
229-
LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for trigger:%s, we voted yes for it already\n", __func__, trigger_hash.ToString());
234+
LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for trigger:%s, we voted yes for it already\n",
235+
__func__, trigger_hash.ToString());
230236
continue;
231237
}
232238
if (vote_rec_t voteRecord; govobj->GetCurrentMNVotes(m_mn_activeman.GetOutPoint(), voteRecord)) {
233239
const auto& strFunc = __func__;
234240
if (ranges::any_of(voteRecord.mapInstances, [&](const auto& voteInstancePair) {
235241
if (voteInstancePair.first == VOTE_SIGNAL_FUNDING) {
236242
LogPrint(BCLog::GOBJECT, /* Continued */
237-
"%s -- Not voting NO-FUNDING for trigger:%s, we voted %s for it already\n",
238-
strFunc, trigger_hash.ToString(),
243+
"%s -- Not voting NO-FUNDING for trigger:%s, we voted %s for it already\n", strFunc,
244+
trigger_hash.ToString(),
239245
CGovernanceVoting::ConvertOutcomeToString(voteInstancePair.second.eOutcome));
240246
return true;
241247
}
@@ -261,7 +267,8 @@ bool GovernanceSigner::VoteFundingTrigger(const uint256& nHash, const vote_outco
261267

262268
CGovernanceException exception;
263269
if (!m_govman.ProcessVoteAndRelay(vote, exception, m_connman)) {
264-
LogPrint(BCLog::GOBJECT, "%s -- Vote FUNDING %d for trigger:%s failed:%s\n", __func__, outcome, nHash.ToString(), exception.what());
270+
LogPrint(BCLog::GOBJECT, "%s -- Vote FUNDING %d for trigger:%s failed:%s\n", __func__, outcome,
271+
nHash.ToString(), exception.what());
265272
return false;
266273
}
267274

‎src/governance/signing.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,16 @@ class GovernanceSignerParent
3131
virtual ~GovernanceSignerParent() = default;
3232

3333
virtual bool IsValid() const = 0;
34-
virtual bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, std::shared_ptr<CSuperblock>& pSuperblockRet, int nBlockHeight) = 0;
34+
virtual bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list,
35+
std::shared_ptr<CSuperblock>& pSuperblockRet, int nBlockHeight) = 0;
3536
virtual bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) = 0;
3637
virtual bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) = 0;
3738
virtual int GetCachedBlockHeight() const = 0;
3839
virtual CGovernanceObject* FindGovernanceObject(const uint256& nHash) = 0;
3940
virtual CGovernanceObject* FindGovernanceObjectByDataHash(const uint256& nDataHash) = 0;
4041
virtual std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const = 0;
41-
virtual std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) = 0;
42+
virtual std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(
43+
const CDeterministicMNList& tip_mn_list) = 0;
4244
virtual void AddGovernanceObject(CGovernanceObject& govobj, const CNode* pfrom = nullptr) = 0;
4345
};
4446

@@ -57,8 +59,8 @@ class GovernanceSigner
5759

5860
public:
5961
explicit GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, GovernanceSignerParent& govman,
60-
const CActiveMasternodeManager& mn_activeman,
61-
const ChainstateManager& chainman, const CMasternodeSync& mn_sync);
62+
const CActiveMasternodeManager& mn_activeman, const ChainstateManager& chainman,
63+
const CMasternodeSync& mn_sync);
6264
~GovernanceSigner();
6365

6466
void UpdatedBlockTip(const CBlockIndex* pindex);

‎test/lint/lint-circular-dependencies.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@
4747
"evo/netinfo -> evo/providertx -> evo/netinfo",
4848
"evo/smldiff -> llmq/blockprocessor -> llmq/utils -> llmq/snapshot -> evo/smldiff",
4949
"evo/specialtxman -> validation -> evo/specialtxman",
50-
"governance/governance -> governance/object -> governance/governance",
50+
"governance/classes -> governance/object -> governance/governance -> governance/classes",
51+
"governance/classes -> governance/object -> governance/governance -> governance/signing -> governance/classes",
5152
"governance/governance -> masternode/sync -> governance/governance",
53+
"governance/governance -> net_processing -> masternode/active/context -> governance/governance",
5254
"governance/governance -> net_processing -> governance/governance",
5355
"instantsend/instantsend -> net_processing -> instantsend/instantsend",
5456
"instantsend/instantsend -> net_processing -> llmq/context -> instantsend/instantsend",

0 commit comments

Comments
 (0)