Skip to content

Commit febdaa5

Browse files
kwvgkwvg
committed
refactor: s/governanceManager/govman/g
1 parent 2b76c1f commit febdaa5

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎src/governance/classes.cpp‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -224,16 +224,16 @@ std::vector<CSuperblock_sptr> CGovernanceManager::GetActiveTriggers()
224224
* - Does this block have a non-executed and activated trigger?
225225
*/
226226

227-
bool CSuperblockManager::IsSuperblockTriggered(CGovernanceManager& governanceManager, int nBlockHeight)
227+
bool CSuperblockManager::IsSuperblockTriggered(CGovernanceManager& govman, int nBlockHeight)
228228
{
229229
LogPrint(BCLog::GOBJECT, "CSuperblockManager::IsSuperblockTriggered -- Start nBlockHeight = %d\n", nBlockHeight);
230230
if (!CSuperblock::IsValidBlockHeight(nBlockHeight)) {
231231
return false;
232232
}
233233

234-
LOCK(governanceManager.cs);
234+
LOCK(govman.cs);
235235
// GET ALL ACTIVE TRIGGERS
236-
std::vector<CSuperblock_sptr> vecTriggers = governanceManager.GetActiveTriggers();
236+
std::vector<CSuperblock_sptr> vecTriggers = govman.GetActiveTriggers();
237237

238238
LogPrint(BCLog::GOBJECT, "CSuperblockManager::IsSuperblockTriggered -- vecTriggers.size() = %d\n", vecTriggers.size());
239239

@@ -243,7 +243,7 @@ bool CSuperblockManager::IsSuperblockTriggered(CGovernanceManager& governanceMan
243243
continue;
244244
}
245245

246-
CGovernanceObject* pObj = pSuperblock->GetGovernanceObject(governanceManager);
246+
CGovernanceObject* pObj = pSuperblock->GetGovernanceObject(govman);
247247

248248
if (!pObj) {
249249
LogPrintf("CSuperblockManager::IsSuperblockTriggered -- pObj == nullptr, continuing\n");
@@ -277,22 +277,22 @@ bool CSuperblockManager::IsSuperblockTriggered(CGovernanceManager& governanceMan
277277
}
278278

279279

280-
bool CSuperblockManager::GetBestSuperblock(CGovernanceManager& governanceManager, CSuperblock_sptr& pSuperblockRet, int nBlockHeight)
280+
bool CSuperblockManager::GetBestSuperblock(CGovernanceManager& govman, CSuperblock_sptr& pSuperblockRet, int nBlockHeight)
281281
{
282282
if (!CSuperblock::IsValidBlockHeight(nBlockHeight)) {
283283
return false;
284284
}
285285

286-
AssertLockHeld(governanceManager.cs);
287-
std::vector<CSuperblock_sptr> vecTriggers = governanceManager.GetActiveTriggers();
286+
AssertLockHeld(govman.cs);
287+
std::vector<CSuperblock_sptr> vecTriggers = govman.GetActiveTriggers();
288288
int nYesCount = 0;
289289

290290
for (const auto& pSuperblock : vecTriggers) {
291291
if (!pSuperblock || nBlockHeight != pSuperblock->GetBlockHeight()) {
292292
continue;
293293
}
294294

295-
const CGovernanceObject* pObj = pSuperblock->GetGovernanceObject(governanceManager);
295+
const CGovernanceObject* pObj = pSuperblock->GetGovernanceObject(govman);
296296

297297
if (!pObj) {
298298
continue;
@@ -316,14 +316,14 @@ bool CSuperblockManager::GetBestSuperblock(CGovernanceManager& governanceManager
316316
* - Returns payments for superblock
317317
*/
318318

319-
bool CSuperblockManager::GetSuperblockPayments(CGovernanceManager& governanceManager, int nBlockHeight, std::vector<CTxOut>& voutSuperblockRet)
319+
bool CSuperblockManager::GetSuperblockPayments(CGovernanceManager& govman, int nBlockHeight, std::vector<CTxOut>& voutSuperblockRet)
320320
{
321-
LOCK(governanceManager.cs);
321+
LOCK(govman.cs);
322322

323323
// GET THE BEST SUPERBLOCK FOR THIS BLOCK HEIGHT
324324

325325
CSuperblock_sptr pSuperblock;
326-
if (!CSuperblockManager::GetBestSuperblock(governanceManager, pSuperblock, nBlockHeight)) {
326+
if (!CSuperblockManager::GetBestSuperblock(govman, pSuperblock, nBlockHeight)) {
327327
LogPrint(BCLog::GOBJECT, "CSuperblockManager::GetSuperblockPayments -- Can't find superblock for height %d\n", nBlockHeight);
328328
return false;
329329
}
@@ -362,29 +362,29 @@ bool CSuperblockManager::GetSuperblockPayments(CGovernanceManager& governanceMan
362362
return true;
363363
}
364364

365-
bool CSuperblockManager::IsValid(CGovernanceManager& governanceManager, const CTransaction& txNew, int nBlockHeight, CAmount blockReward)
365+
bool CSuperblockManager::IsValid(CGovernanceManager& govman, const CTransaction& txNew, int nBlockHeight, CAmount blockReward)
366366
{
367367
// GET BEST SUPERBLOCK, SHOULD MATCH
368-
LOCK(governanceManager.cs);
368+
LOCK(govman.cs);
369369

370370
CSuperblock_sptr pSuperblock;
371-
if (CSuperblockManager::GetBestSuperblock(governanceManager, pSuperblock, nBlockHeight)) {
372-
return pSuperblock->IsValid(governanceManager, txNew, nBlockHeight, blockReward);
371+
if (CSuperblockManager::GetBestSuperblock(govman, pSuperblock, nBlockHeight)) {
372+
return pSuperblock->IsValid(govman, txNew, nBlockHeight, blockReward);
373373
}
374374

375375
return false;
376376
}
377377

378-
void CSuperblockManager::ExecuteBestSuperblock(CGovernanceManager& governanceManager, int nBlockHeight)
378+
void CSuperblockManager::ExecuteBestSuperblock(CGovernanceManager& govman, int nBlockHeight)
379379
{
380-
LOCK(governanceManager.cs);
380+
LOCK(govman.cs);
381381

382382
CSuperblock_sptr pSuperblock;
383-
if (GetBestSuperblock(governanceManager, pSuperblock, nBlockHeight)) {
383+
if (GetBestSuperblock(govman, pSuperblock, nBlockHeight)) {
384384
// All checks are done in CSuperblock::IsValid via IsBlockValueValid and IsBlockPayeeValid,
385385
// tip wouldn't be updated if anything was wrong. Mark this trigger as executed.
386386
pSuperblock->SetExecuted();
387-
governanceManager.ResetVotedFundingTrigger();
387+
govman.ResetVotedFundingTrigger();
388388
}
389389
}
390390

@@ -442,10 +442,10 @@ CSuperblock::CSuperblock(int nBlockHeight, std::vector<CGovernancePayment> vecPa
442442
nGovObjHash = GetHash();
443443
}
444444

445-
CGovernanceObject* CSuperblock::GetGovernanceObject(CGovernanceManager& governanceManager)
445+
CGovernanceObject* CSuperblock::GetGovernanceObject(CGovernanceManager& govman)
446446
{
447-
AssertLockHeld(governanceManager.cs);
448-
CGovernanceObject* pObj = governanceManager.FindGovernanceObject(nGovObjHash);
447+
AssertLockHeld(govman.cs);
448+
CGovernanceObject* pObj = govman.FindGovernanceObject(nGovObjHash);
449449
return pObj;
450450
}
451451

@@ -695,7 +695,7 @@ bool CSuperblock::IsValid(CGovernanceManager& govman, const CTransaction& txNew,
695695
return true;
696696
}
697697

698-
bool CSuperblock::IsExpired(const CGovernanceManager& governanceManager) const
698+
bool CSuperblock::IsExpired(const CGovernanceManager& govman) const
699699
{
700700
int nExpirationBlocks;
701701
// Executed triggers are kept for another superblock cycle (approximately 1 month for mainnet).
@@ -717,14 +717,14 @@ bool CSuperblock::IsExpired(const CGovernanceManager& governanceManager) const
717717

718718
LogPrint(BCLog::GOBJECT, "CSuperblock::IsExpired -- nBlockHeight = %d, nExpirationBlock = %d\n", nBlockHeight, nExpirationBlock);
719719

720-
if (governanceManager.GetCachedBlockHeight() > nExpirationBlock) {
720+
if (govman.GetCachedBlockHeight() > nExpirationBlock) {
721721
LogPrint(BCLog::GOBJECT, "CSuperblock::IsExpired -- Outdated trigger found\n");
722722
return true;
723723
}
724724

725725
if (Params().NetworkIDString() != CBaseChainParams::MAIN) {
726726
// NOTE: this can happen on testnet/devnets due to reorgs, should never happen on mainnet
727-
if (governanceManager.GetCachedBlockHeight() + Params().GetConsensus().nSuperblockCycle * 2 < nBlockHeight) {
727+
if (govman.GetCachedBlockHeight() + Params().GetConsensus().nSuperblockCycle * 2 < nBlockHeight) {
728728
LogPrint(BCLog::GOBJECT, "CSuperblock::IsExpired -- Trigger is too far into the future\n");
729729
return true;
730730
}

‎src/governance/classes.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ CAmount ParsePaymentAmount(const std::string& strAmount);
3030
class CSuperblockManager
3131
{
3232
private:
33-
static bool GetBestSuperblock(CGovernanceManager& governanceManager, CSuperblock_sptr& pSuperblockRet, int nBlockHeight);
33+
static bool GetBestSuperblock(CGovernanceManager& govman, CSuperblock_sptr& pSuperblockRet, int nBlockHeight);
3434

3535
public:
36-
static bool IsSuperblockTriggered(CGovernanceManager& governanceManager, int nBlockHeight);
36+
static bool IsSuperblockTriggered(CGovernanceManager& govman, int nBlockHeight);
3737

38-
static bool GetSuperblockPayments(CGovernanceManager& governanceManager, int nBlockHeight, std::vector<CTxOut>& voutSuperblockRet);
39-
static void ExecuteBestSuperblock(CGovernanceManager& governanceManager, int nBlockHeight);
38+
static bool GetSuperblockPayments(CGovernanceManager& govman, int nBlockHeight, std::vector<CTxOut>& voutSuperblockRet);
39+
static void ExecuteBestSuperblock(CGovernanceManager& govman, int nBlockHeight);
4040

41-
static bool IsValid(CGovernanceManager& governanceManager, const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
41+
static bool IsValid(CGovernanceManager& govman, const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
4242
};
4343

4444
/**
@@ -115,7 +115,7 @@ class CSuperblock : public CGovernanceObject
115115
// TELL THE ENGINE WE EXECUTED THIS EVENT
116116
void SetExecuted() { nStatus = SeenObjectStatus::Executed; }
117117

118-
CGovernanceObject* GetGovernanceObject(CGovernanceManager& governanceManager);
118+
CGovernanceObject* GetGovernanceObject(CGovernanceManager& govman);
119119

120120
int GetBlockHeight() const
121121
{
@@ -127,7 +127,7 @@ class CSuperblock : public CGovernanceObject
127127
CAmount GetPaymentsTotalAmount();
128128

129129
bool IsValid(CGovernanceManager& govman, const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
130-
bool IsExpired(const CGovernanceManager& governanceManager) const;
130+
bool IsExpired(const CGovernanceManager& govman) const;
131131

132132
std::vector<uint256> GetProposalHashes() const;
133133
};

0 commit comments

Comments
 (0)