refactor: add cs annotations for accessor functions

Author: kwvg

src/governance/governance.cpp

@@ -203,7 +203,13 @@ bool CGovernanceManager::SerializeVoteForHash(const uint256& nHash, CDataStream&
 void CGovernanceManager::AddPostponedObject(const CGovernanceObject& govobj)
 {
     LOCK(cs);
-    mapPostponedObjects.emplace(govobj.GetHash(), govobj);
+    AddPostponedObjectInternal(govobj);
+}
+
+void CGovernanceManager::AddPostponedObjectInternal(const CGovernanceObject& govobj)
+{
+    AssertLockHeld(cs);
+    mapPostponedObjects.insert(std::make_pair(govobj.GetHash(), govobj));
 }
 
 MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman& connman, std::string_view msg_type,
@@ -289,7 +295,7 @@ MessageProcessingResult CGovernanceManager::ProcessMessage(CNode& peer, CConnman
 
         if (!fIsValid) {
             if (fMissingConfirmations) {
-                AddPostponedObject(govobj);
+                AddPostponedObjectInternal(govobj);
                 LogPrintf("MNGOVERNANCEOBJECT -- Not enough fee confirmations for: %s, strError = %s\n", strHash, strError);
             } else {
                 LogPrint(BCLog::GOBJECT, "MNGOVERNANCEOBJECT -- Governance object is invalid - %s\n", strError);

src/governance/governance.h

@@ -322,17 +322,26 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
     // Thread-safe accessors
     bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
-                           int nBlockHeight) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    bool HaveObjectForHash(const uint256& nHash) const;
-    bool HaveVoteForHash(const uint256& nHash) const;
-    bool SerializeObjectForHash(const uint256& nHash, CDataStream& ss) const;
-    bool SerializeVoteForHash(const uint256& nHash, CDataStream& ss) const;
-    CGovernanceObject* FindGovernanceObject(const uint256& nHash) override EXCLUSIVE_LOCKS_REQUIRED(!cs);
-    int GetVoteCount() const;
-    void AddPostponedObject(const CGovernanceObject& govobj);
+                           int nBlockHeight) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool HaveObjectForHash(const uint256& nHash) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool HaveVoteForHash(const uint256& nHash) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool SerializeObjectForHash(const uint256& nHash, CDataStream& ss) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool SerializeVoteForHash(const uint256& nHash, CDataStream& ss) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    CGovernanceObject* FindGovernanceObject(const uint256& nHash) override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    int GetVoteCount() const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    void AddPostponedObject(const CGovernanceObject& govobj)
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     // Thread-safe accessors for trigger management
-    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const override EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const override
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     void MasternodeRateUpdate(const CGovernanceObject& govobj);
 
@@ -390,10 +399,15 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 
 private:
     // Internal counterparts to "Thread-safe accessors"
+    void AddPostponedObjectInternal(const CGovernanceObject& govobj)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
     bool GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
-                                   int nBlockHeight) EXCLUSIVE_LOCKS_REQUIRED(cs);
-    CGovernanceObject* FindGovernanceObjectInternal(const uint256& nHash) EXCLUSIVE_LOCKS_REQUIRED(cs);
-    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const EXCLUSIVE_LOCKS_REQUIRED(cs);
+                                   int nBlockHeight)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
+    CGovernanceObject* FindGovernanceObjectInternal(const uint256& nHash)
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
+    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const
+        EXCLUSIVE_LOCKS_REQUIRED(cs);
 
     void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight);