Skip to content

Commit f6db09b

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

File tree

5 files changed

+51
-34
lines changed

5 files changed

+51
-34
lines changed

‎src/governance/governance.cpp‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ void CGovernanceManager::AddPostponedObject(const CGovernanceObject& govobj)
203203
mapPostponedObjects.insert(std::make_pair(govobj.GetHash(), govobj));
204204
}
205205

206-
MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type, CDataStream& vRecv)
206+
MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
207+
CDataStream& vRecv)
207208
{
208209
AssertLockNotHeld(cs_relay);
209210
if (!IsValid()) return {};
@@ -512,7 +513,8 @@ void CGovernanceManager::CheckAndRemove()
512513
nTimeExpired = std::numeric_limits<int64_t>::max();
513514
} else {
514515
int64_t nSuperblockCycleSeconds = Params().GetConsensus().nSuperblockCycle * Params().GetConsensus().nPowTargetSpacing;
515-
nTimeExpired = pObj->GetCreationTime() + 2 * nSuperblockCycleSeconds + count_seconds(GOVERNANCE_DELETION_DELAY);
516+
nTimeExpired = pObj->GetCreationTime() + 2 * nSuperblockCycleSeconds +
517+
count_seconds(GOVERNANCE_DELETION_DELAY);
516518
}
517519

518520
mapErasedGovernanceObjects.insert(std::make_pair(nHash, nTimeExpired));
@@ -922,7 +924,8 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
922924
std::string msg{strprintf("CGovernanceManager::%s -- Unknown parent object %s, MN outpoint = %s", __func__,
923925
nHashGovobj.ToString(), vote.GetMasternodeOutpoint().ToStringShort())};
924926
exception = CGovernanceException(msg, GOVERNANCE_EXCEPTION_WARNING);
925-
if (cmmapOrphanVotes.Insert(nHashGovobj, vote_time_pair_t(vote, count_seconds(GetTime<std::chrono::seconds>() + GOVERNANCE_ORPHAN_EXPIRATION_TIME)))) {
927+
if (cmmapOrphanVotes.Insert(nHashGovobj, vote_time_pair_t(vote, count_seconds(GetTime<std::chrono::seconds>() +
928+
GOVERNANCE_ORPHAN_EXPIRATION_TIME)))) {
926929
LEAVE_CRITICAL_SECTION(cs);
927930
RequestGovernanceObject(pfrom, nHashGovobj, connman);
928931
LogPrint(BCLog::GOBJECT, "%s\n", msg);
@@ -993,8 +996,10 @@ void CGovernanceManager::CheckPostponedObjects()
993996

994997
int64_t nTimestamp = govobj.GetCreationTime();
995998

996-
bool fValid = (nTimestamp <= nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION)) && (nTimestamp >= nNow - 2 * nSuperblockCycleSeconds);
997-
bool fReady = (nTimestamp <= nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION) - count_seconds(RELIABLE_PROPAGATION_TIME));
999+
bool fValid = (nTimestamp <= nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION)) &&
1000+
(nTimestamp >= nNow - 2 * nSuperblockCycleSeconds);
1001+
bool fReady = (nTimestamp <=
1002+
nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION) - count_seconds(RELIABLE_PROPAGATION_TIME));
9981003

9991004
if (fValid) {
10001005
if (fReady) {
@@ -1612,8 +1617,8 @@ bool CGovernanceManager::GetBestSuperblock(const CDeterministicMNList& tip_mn_li
16121617
return InternalGetBestSuperblock(tip_mn_list, pSuperblockRet, nBlockHeight);
16131618
}
16141619

1615-
bool CGovernanceManager::InternalGetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
1616-
int nBlockHeight)
1620+
bool CGovernanceManager::InternalGetBestSuperblock(const CDeterministicMNList& tip_mn_list,
1621+
CSuperblock_sptr& pSuperblockRet, int nBlockHeight)
16171622
{
16181623
if (!CSuperblock::IsValidBlockHeight(nBlockHeight)) {
16191624
return false;
@@ -1718,7 +1723,8 @@ void CGovernanceManager::ExecuteBestSuperblock(const CDeterministicMNList& tip_m
17181723
}
17191724
}
17201725

1721-
std::vector<std::shared_ptr<const CGovernanceObject>> CGovernanceManager::GetApprovedProposals(const CDeterministicMNList& tip_mn_list)
1726+
std::vector<std::shared_ptr<const CGovernanceObject>> CGovernanceManager::GetApprovedProposals(
1727+
const CDeterministicMNList& tip_mn_list)
17221728
{
17231729
AssertLockNotHeld(cs);
17241730

‎src/governance/governance.h‎

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

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

299299
const CGovernanceObject* FindConstGovernanceObject(const uint256& nHash) const EXCLUSIVE_LOCKS_REQUIRED(cs);
300300
CGovernanceObject* FindGovernanceObject(const uint256& nHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
@@ -383,8 +383,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
383383
bool IsValidSuperblock(const CChain& active_chain, const CDeterministicMNList& tip_mn_list,
384384
const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
385385

386-
bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet, int nBlockHeight) override
387-
EXCLUSIVE_LOCKS_REQUIRED(!cs);
386+
bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
387+
int nBlockHeight) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
388388

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

399399
void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight);
400400

‎src/governance/signing.cpp‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ std::optional<const CSuperblock> GovernanceSigner::CreateSuperblockCandidate(int
3838
{
3939
if (!m_govman.IsValid()) return std::nullopt;
4040
if (!m_mn_sync.IsSynced()) return std::nullopt;
41-
if (nHeight % Params().GetConsensus().nSuperblockCycle < Params().GetConsensus().nSuperblockCycle - Params().GetConsensus().nSuperblockMaturityWindow) return std::nullopt;
41+
if (nHeight % Params().GetConsensus().nSuperblockCycle <
42+
Params().GetConsensus().nSuperblockCycle - Params().GetConsensus().nSuperblockMaturityWindow)
43+
return std::nullopt;
4244
if (HasAlreadyVotedFundingTrigger()) return std::nullopt;
4345

4446
const auto approvedProposals = m_govman.GetApprovedProposals(m_dmnman.GetListAtChainTip());
@@ -52,7 +54,8 @@ std::optional<const CSuperblock> GovernanceSigner::CreateSuperblockCandidate(int
5254
int nNextSuperblock;
5355

5456
CSuperblock::GetNearestSuperblocksHeights(nHeight, nLastSuperblock, nNextSuperblock);
55-
auto SBEpochTime = static_cast<int64_t>(GetTime<std::chrono::seconds>().count() + (nNextSuperblock - nHeight) * 2.62 * 60);
57+
auto SBEpochTime = static_cast<int64_t>(GetTime<std::chrono::seconds>().count() +
58+
(nNextSuperblock - nHeight) * 2.62 * 60);
5659
auto governanceBudget = CSuperblock::GetPaymentsLimit(m_chainman.ActiveChain(), nNextSuperblock);
5760

5861
CAmount budgetAllocated{};
@@ -66,9 +69,8 @@ std::optional<const CSuperblock> GovernanceSigner::CreateSuperblockCandidate(int
6669
CAmount nAmount{};
6770
try {
6871
nAmount = ParsePaymentAmount(jproposal["payment_amount"].getValStr());
69-
}
70-
catch (const std::runtime_error& e) {
71-
LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d Skipping payment exception:%s\n", __func__,nHeight, e.what());
72+
} catch (const std::runtime_error& e) {
73+
LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d Skipping payment exception:%s\n", __func__, nHeight, e.what());
7274
continue;
7375
}
7476

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

8587
// Skip proposals if the SB isn't within the proposal time window
8688
if (SBEpochTime < windowStart) {
87-
LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d SB:%d windowStart:%d\n", __func__,nHeight, SBEpochTime, windowStart);
89+
LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d SB:%d windowStart:%d\n", __func__, nHeight, SBEpochTime,
90+
windowStart);
8891
continue;
8992
}
9093
if (SBEpochTime > windowEnd) {
91-
LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d SB:%d windowEnd:%d\n", __func__,nHeight, SBEpochTime, windowEnd);
94+
LogPrint(BCLog::GOBJECT, "%s -- nHeight:%d SB:%d windowEnd:%d\n", __func__, nHeight, SBEpochTime, windowEnd);
9295
continue;
9396
}
9497

@@ -119,7 +122,7 @@ std::optional<const CGovernanceObject> GovernanceSigner::CreateGovernanceTrigger
119122
// no sb_opt, no trigger
120123
if (!sb_opt.has_value()) return std::nullopt;
121124

122-
//TODO: Check if nHashParentIn, nRevision and nCollateralHashIn are correct
125+
// TODO: Check if nHashParentIn, nRevision and nCollateralHashIn are correct
123126
LOCK(::cs_main);
124127

125128
// Check if identical trigger (equal DataHash()) is already created (signed by other masternode)
@@ -130,7 +133,7 @@ std::optional<const CGovernanceObject> GovernanceSigner::CreateGovernanceTrigger
130133
}
131134

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

@@ -152,7 +155,8 @@ std::optional<const CGovernanceObject> GovernanceSigner::CreateGovernanceTrigger
152155
}
153156

154157
if (!m_govman.MasternodeRateCheck(gov_sb)) {
155-
LogPrint(BCLog::GOBJECT, "%s -- Trigger rejected because of rate check failure hash(%s)\n", __func__, gov_sb.GetHash().ToString());
158+
LogPrint(BCLog::GOBJECT, "%s -- Trigger rejected because of rate check failure hash(%s)\n", __func__,
159+
gov_sb.GetHash().ToString());
156160
return std::nullopt;
157161
}
158162

@@ -213,21 +217,23 @@ void GovernanceSigner::VoteGovernanceTriggers(const std::optional<const CGoverna
213217
const uint256 trigger_hash = govobj->GetHash();
214218
if (trigger->GetBlockHeight() <= m_govman.GetCachedBlockHeight()) {
215219
// ignore triggers from the past
216-
LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for outdated trigger:%s\n", __func__, trigger_hash.ToString());
220+
LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for outdated trigger:%s\n", __func__,
221+
trigger_hash.ToString());
217222
continue;
218223
}
219224
if (trigger_hash == votedFundingYesTriggerHash) {
220225
// Skip actual trigger
221-
LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for trigger:%s, we voted yes for it already\n", __func__, trigger_hash.ToString());
226+
LogPrint(BCLog::GOBJECT, "%s -- Not voting NO-FUNDING for trigger:%s, we voted yes for it already\n",
227+
__func__, trigger_hash.ToString());
222228
continue;
223229
}
224230
if (vote_rec_t voteRecord; govobj->GetCurrentMNVotes(m_mn_activeman.GetOutPoint(), voteRecord)) {
225231
const auto& strFunc = __func__;
226232
if (ranges::any_of(voteRecord.mapInstances, [&](const auto& voteInstancePair) {
227233
if (voteInstancePair.first == VOTE_SIGNAL_FUNDING) {
228234
LogPrint(BCLog::GOBJECT, /* Continued */
229-
"%s -- Not voting NO-FUNDING for trigger:%s, we voted %s for it already\n",
230-
strFunc, trigger_hash.ToString(),
235+
"%s -- Not voting NO-FUNDING for trigger:%s, we voted %s for it already\n", strFunc,
236+
trigger_hash.ToString(),
231237
CGovernanceVoting::ConvertOutcomeToString(voteInstancePair.second.eOutcome));
232238
return true;
233239
}
@@ -253,7 +259,8 @@ bool GovernanceSigner::VoteFundingTrigger(const uint256& nHash, const vote_outco
253259

254260
CGovernanceException exception;
255261
if (!m_govman.ProcessVoteAndRelay(vote, exception, m_connman)) {
256-
LogPrint(BCLog::GOBJECT, "%s -- Vote FUNDING %d for trigger:%s failed:%s\n", __func__, outcome, nHash.ToString(), exception.what());
262+
LogPrint(BCLog::GOBJECT, "%s -- Vote FUNDING %d for trigger:%s failed:%s\n", __func__, outcome,
263+
nHash.ToString(), exception.what());
257264
return false;
258265
}
259266

‎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)