refactor: static class members to static anonymous functions of CSigningSharesManager

They have no external calls outside of signing_shares

Author: knst

src/llmq/signing_shares.cpp

@@ -234,7 +234,7 @@ bool CSigSharesManager::ProcessMessageSigSesAnn(const CNode& pfrom, const CSigSe
     return true;
 }
 
-bool CSigSharesManager::VerifySigSharesInv(Consensus::LLMQType llmqType, const CSigSharesInv& inv)
+static bool VerifySigSharesInv(Consensus::LLMQType llmqType, const CSigSharesInv& inv)
 {
     const auto& llmq_params_opt = Params().GetLLMQ(llmqType);
     return llmq_params_opt.has_value() && (inv.inv.size() == size_t(llmq_params_opt->size));
@@ -303,6 +303,28 @@ static bool PreVerifySigShareQuorum(const CActiveMasternodeManager& mn_activeman
     return true;
 }
 
+// Ban node if PreVerifyBatchedSigShares failed
+bool PreVerifyBatchedSigShares(const CSigSharesNodeState::SessionInfo& session, const CBatchedSigShares& batchedSigShares)
+{
+    std::unordered_set<uint16_t> dupMembers;
+
+    for (const auto& [quorumMember, _] : batchedSigShares.sigShares) {
+        if (!dupMembers.emplace(quorumMember).second) {
+            return false;
+        }
+
+        if (quorumMember >= session.quorum->members.size()) {
+            LogPrint(BCLog::LLMQ_SIGS, "%s -- quorumMember out of bounds\n", __func__);
+            return false;
+        }
+        if (!session.quorum->qc->validMembers[quorumMember]) {
+            LogPrint(BCLog::LLMQ_SIGS, "%s -- quorumMember not valid\n", __func__);
+            return false;
+        }
+    }
+    return true;
+}
+
 bool CSigSharesManager::ProcessMessageBatchedSigShares(const CNode& pfrom, const CBatchedSigShares& batchedSigShares)
 {
     CSigSharesNodeState::SessionInfo sessionInfo;
@@ -409,29 +431,6 @@ bool CSigSharesManager::ProcessMessageSigShare(NodeId fromId, const CSigShare& s
     return true;
 }
 
-// Ban node if PreVerifyBatchedSigShares failed
-bool CSigSharesManager::PreVerifyBatchedSigShares(const CSigSharesNodeState::SessionInfo& session,
-                                                  const CBatchedSigShares& batchedSigShares)
-{
-    std::unordered_set<uint16_t> dupMembers;
-
-    for (const auto& [quorumMember, _] : batchedSigShares.sigShares) {
-        if (!dupMembers.emplace(quorumMember).second) {
-            return false;
-        }
-
-        if (quorumMember >= session.quorum->members.size()) {
-            LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- quorumMember out of bounds\n", __func__);
-            return false;
-        }
-        if (!session.quorum->qc->validMembers[quorumMember]) {
-            LogPrint(BCLog::LLMQ_SIGS, "CSigSharesManager::%s -- quorumMember not valid\n", __func__);
-            return false;
-        }
-    }
-    return true;
-}
-
 bool CSigSharesManager::CollectPendingSigSharesToVerify(
     size_t maxUniqueSessions, std::unordered_map<NodeId, std::vector<CSigShare>>& retSigShares,
     std::unordered_map<std::pair<Consensus::LLMQType, uint256>, CQuorumCPtr, StaticSaltedHasher>& retQuorums)

src/llmq/signing_shares.h

@@ -469,10 +469,6 @@ class CSigSharesManager : public llmq::CRecoveredSigsListener
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
 private:
-    static bool VerifySigSharesInv(Consensus::LLMQType llmqType, const CSigSharesInv& inv);
-    static bool PreVerifyBatchedSigShares(const CSigSharesNodeState::SessionInfo& session,
-                                          const CBatchedSigShares& batchedSigShares);
-
     [[nodiscard]] std::shared_ptr<CRecoveredSig> ProcessSigShare(const CSigShare& sigShare, const CQuorumCPtr& quorum)
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
     [[nodiscard]] std::shared_ptr<CRecoveredSig> TryRecoverSig(const CQuorum& quorum, const uint256& id,