sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 11:32:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: s/sporkManager/sporkman/g

Browse Source 
sporkManager was the name of the global that's been removed a commit ago,
remove variable names that could be misread as the global still existing
This commit is contained in:
Kittywhiskers Van Gogh 2024-02-28 11:42:36 +00:00
parent 60fd1aa774
commit 405b8c669a
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
10 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/auto_gdb/debug.gdb
View File

@ -7,6 +7,6 @@ source test_used_size.gdb
#logsize mnodeman "memlog.txt"
logsize mnpayments "memlog.txt"
#logsize instantsend "memlog.txt"
#logsize sporkManager "memlog.txt"
#logsize sporkman "memlog.txt"
#logsize masternodeSync "memlog.txt"
#logsize governance "memlog.txt"

4
src/governance/governance.cpp
View File

@ -1563,7 +1563,7 @@ void CGovernanceManager::RemoveInvalidVotes()
lastMNListForVotingKeys = std::make_shared<CDeterministicMNList>(curMNList);
}
bool AreSuperblocksEnabled(const CSporkManager& sporkManager)
bool AreSuperblocksEnabled(const CSporkManager& sporkman)
{
return sporkManager.IsSporkActive(SPORK_9_SUPERBLOCKS_ENABLED);
return sporkman.IsSporkActive(SPORK_9_SUPERBLOCKS_ENABLED);
}

2
src/governance/governance.h
View File

@ -403,6 +403,6 @@ private:
};
bool AreSuperblocksEnabled(const CSporkManager& sporkManager);
bool AreSuperblocksEnabled(const CSporkManager& sporkman);
#endif // BITCOIN_GOVERNANCE_GOVERNANCE_H

12
src/llmq/chainlocks.cpp
View File

@ -26,7 +26,7 @@ namespace llmq
std::unique_ptr<CChainLocksHandler> chainLocksHandler;
CChainLocksHandler::CChainLocksHandler(CChainState& chainstate, CConnman& _connman, CMasternodeSync& mn_sync, CQuorumManager& _qman,
CSigningManager& _sigman, CSigSharesManager& _shareman, CSporkManager& sporkManager,
CSigningManager& _sigman, CSigSharesManager& _shareman, CSporkManager& sporkman,
CTxMemPool& _mempool) :
m_chainstate(chainstate),
connman(_connman),
@ -34,7 +34,7 @@ CChainLocksHandler::CChainLocksHandler(CChainState& chainstate, CConnman& _connm
qman(_qman),
sigman(_sigman),
shareman(_shareman),
spork_manager(sporkManager),
spork_manager(sporkman),
mempool(_mempool),
scheduler(std::make_unique<CScheduler>()),
scheduler_thread(std::make_unique<std::thread>(std::thread(util::TraceThread, "cl-schdlr", [&] { scheduler->serviceQueue(); })))
@ -668,14 +668,14 @@ void CChainLocksHandler::Cleanup()
lastCleanupTime = GetTimeMillis();
}
bool AreChainLocksEnabled(const CSporkManager& sporkManager)
bool AreChainLocksEnabled(const CSporkManager& sporkman)
{
return sporkManager.IsSporkActive(SPORK_19_CHAINLOCKS_ENABLED);
return sporkman.IsSporkActive(SPORK_19_CHAINLOCKS_ENABLED);
}
bool ChainLocksSigningEnabled(const CSporkManager& sporkManager)
bool ChainLocksSigningEnabled(const CSporkManager& sporkman)
{
return sporkManager.GetSporkValue(SPORK_19_CHAINLOCKS_ENABLED) == 0;
return sporkman.GetSporkValue(SPORK_19_CHAINLOCKS_ENABLED) == 0;
}
} // namespace llmq

6
src/llmq/chainlocks.h
View File

@ -86,7 +86,7 @@ private:
public:
explicit CChainLocksHandler(CChainState& chainstate, CConnman& _connman, CMasternodeSync& mn_sync, CQuorumManager& _qman,
CSigningManager& _sigman, CSigSharesManager& _shareman, CSporkManager& sporkManager,
CSigningManager& _sigman, CSigSharesManager& _shareman, CSporkManager& sporkman,
CTxMemPool& _mempool);
~CChainLocksHandler();
@ -128,8 +128,8 @@ private:
extern std::unique_ptr<CChainLocksHandler> chainLocksHandler;
bool AreChainLocksEnabled(const CSporkManager& sporkManager);
bool ChainLocksSigningEnabled(const CSporkManager& sporkManager);
bool AreChainLocksEnabled(const CSporkManager& sporkman);
bool ChainLocksSigningEnabled(const CSporkManager& sporkman);
} // namespace llmq

8
src/llmq/dkgsessionmgr.cpp
View File

@ -25,7 +25,7 @@ static const std::string DB_SKCONTRIB = "qdkg_S";
static const std::string DB_ENC_CONTRIB = "qdkg_E";
CDKGSessionManager::CDKGSessionManager(CBLSWorker& _blsWorker, CChainState& chainstate, CConnman& _connman, CDKGDebugManager& _dkgDebugManager,
CQuorumBlockProcessor& _quorumBlockProcessor, const CSporkManager& sporkManager,
CQuorumBlockProcessor& _quorumBlockProcessor, const CSporkManager& sporkman,
bool unitTests, bool fWipe) :
db(std::make_unique<CDBWrapper>(unitTests ? "" : (GetDataDir() / "llmq/dkgdb"), 1 << 20, unitTests, fWipe)),
blsWorker(_blsWorker),
@ -33,7 +33,7 @@ CDKGSessionManager::CDKGSessionManager(CBLSWorker& _blsWorker, CChainState& chai
connman(_connman),
dkgDebugManager(_dkgDebugManager),
quorumBlockProcessor(_quorumBlockProcessor),
spork_manager(sporkManager)
spork_manager(sporkman)
{
if (!fMasternodeMode && !IsWatchQuorumsEnabled()) {
// Regular nodes do not care about any DKG internals, bail out
@ -520,9 +520,9 @@ void CDKGSessionManager::CleanupOldContributions() const
}
}
bool IsQuorumDKGEnabled(const CSporkManager& sporkManager)
bool IsQuorumDKGEnabled(const CSporkManager& sporkman)
{
return sporkManager.IsSporkActive(SPORK_17_QUORUM_DKG_ENABLED);
return sporkman.IsSporkActive(SPORK_17_QUORUM_DKG_ENABLED);
}
} // namespace llmq

4
src/llmq/dkgsessionmgr.h
View File

@ -64,7 +64,7 @@ private:
public:
CDKGSessionManager(CBLSWorker& _blsWorker, CChainState& chainstate, CConnman& _connman, CDKGDebugManager& _dkgDebugManager,
CQuorumBlockProcessor& _quorumBlockProcessor, const CSporkManager& sporkManager,
CQuorumBlockProcessor& _quorumBlockProcessor, const CSporkManager& sporkman,
bool unitTests, bool fWipe);
~CDKGSessionManager() = default;
@ -96,7 +96,7 @@ private:
void CleanupCache() const;
};
bool IsQuorumDKGEnabled(const CSporkManager& sporkManager);
bool IsQuorumDKGEnabled(const CSporkManager& sporkman);
} // namespace llmq
#endif // BITCOIN_LLMQ_DKGSESSIONMGR_H

4
src/llmq/instantsend.h
View File

@ -256,11 +256,11 @@ private:
public:
explicit CInstantSendManager(CChainLocksHandler& _clhandler, CChainState& chainstate, CConnman& _connman,
CQuorumManager& _qman, CSigningManager& _sigman, CSigSharesManager& _shareman,
CSporkManager& sporkManager, CTxMemPool& _mempool, const CMasternodeSync& mn_sync,
CSporkManager& sporkman, CTxMemPool& _mempool, const CMasternodeSync& mn_sync,
bool unitTests, bool fWipe) :
db(unitTests, fWipe),
clhandler(_clhandler), m_chainstate(chainstate), connman(_connman), qman(_qman), sigman(_sigman),
shareman(_shareman), spork_manager(sporkManager), mempool(_mempool), m_mn_sync(mn_sync)
shareman(_shareman), spork_manager(sporkman), mempool(_mempool), m_mn_sync(mn_sync)
{
workInterrupt.reset();
}

4
src/llmq/signing_shares.cpp
View File

@ -215,14 +215,14 @@ void CSigSharesManager::InterruptWorkerThread()
workInterrupt();
}
void CSigSharesManager::ProcessMessage(const CNode& pfrom, const CSporkManager& sporkManager, const std::string& msg_type, CDataStream& vRecv)
void CSigSharesManager::ProcessMessage(const CNode& pfrom, const CSporkManager& sporkman, const std::string& msg_type, CDataStream& vRecv)
{
// non-masternodes are not interested in sigshares
if (!fMasternodeMode || WITH_LOCK(activeMasternodeInfoCs, return activeMasternodeInfo.proTxHash.IsNull())) {
return;
}
if (sporkManager.IsSporkActive(SPORK_21_QUORUM_ALL_CONNECTED) && msg_type == NetMsgType::QSIGSHARE) {
if (sporkman.IsSporkActive(SPORK_21_QUORUM_ALL_CONNECTED) && msg_type == NetMsgType::QSIGSHARE) {
std::vector<CSigShare> receivedSigShares;
vRecv >> receivedSigShares;

2
src/llmq/signing_shares.h
View File

@ -424,7 +424,7 @@ public:
void UnregisterAsRecoveredSigsListener();
void InterruptWorkerThread();
void ProcessMessage(const CNode& pnode, const CSporkManager& sporkManager, const std::string& msg_type, CDataStream& vRecv);
void ProcessMessage(const CNode& pnode, const CSporkManager& sporkman, const std::string& msg_type, CDataStream& vRecv);
void AsyncSign(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash);
std::optional<CSigShare> CreateSigShare(const CQuorumCPtr& quorum, const uint256& id, const uint256& msgHash) const;