add dirty flag for future use

Evan Duffield · Evan Duffield · commit 390c9c39281e · 2016-06-09T10:50:54.000-07:00
diff --git a/src/governance.cpp b/src/governance.cpp
@@ -265,30 +265,24 @@ void CGovernanceManager::CheckAndRemove()
 
     std::map<uint256, CGovernanceObject>::iterator it = mapObjects.begin();
     while(it != mapObjects.end())
-    {
+    {   
         CGovernanceObject* pObj = &((*it).second);
 
+        // UPDATE LOCAL VALIDITY AGAINST CRYPTO DATA
         pObj->UpdateLocalValidity(pCurrentBlockIndex);
+        // UPDATE SENTINEL SIGNALING VARIABLES
         pObj->UpdateSentinelVariables(pCurrentBlockIndex);
-        ++it;
-    }
 
-    // UPDATE CACHING MECHANISMS FOR GOVERNANCE OBJECTS
+        // SHOULD WE DELETE THIS OBJECT FROM MEMORY
 
-    std::string strError = "";
+        /*
+            - delete objects from memory where fCachedDelete is true
+            - this should be robust enough that if someone sends us the proposal later, we should know it was deleted
+        */
 
-    std::map<uint256, CGovernanceObject>::iterator it2 = mapObjects.begin();
-    while(it2 != mapObjects.end())
-    {
-        CGovernanceObject* pObj = &((*it2).second);
-
-        // UPDATE LOCAL VALIDITY AGAINST CRYPTO DATA
-        pObj->UpdateLocalValidity(pCurrentBlockIndex);
-
-        // UPDATE SENTINEL SIGNALING VARIABLES
-        pObj->UpdateSentinelVariables(pCurrentBlockIndex);
-        ++it2;
+        ++it;
     }
+
 }
 
 CGovernanceObject *CGovernanceManager::FindGovernanceObject(const std::string &strName)
@@ -541,6 +535,12 @@ bool CGovernanceManager::AddOrUpdateVote(const CGovernanceVote& vote, std::strin
 
     mapVotesByType[nTypeHash] = vote;
     mapVotesByHash[nHash] = vote;
+
+    // // SET CACHE AS DIRTY / WILL BE UPDATED NEXT BLOCK
+
+    // CGovernanceObject* pGovObj = FindGovernanceObject(vote.GetParentHash());
+    // if(pGovObj) pGovObj->fDirtyCache = true;
+
     return true;
 }
 
@@ -558,7 +558,7 @@ CGovernanceObject::CGovernanceObject()
     fCachedValid = true;
     fCachedDelete = false;
     fCachedEndorsed = false;
-
+    //fDirtyCache = true;
 }
 
 CGovernanceObject::CGovernanceObject(uint256 nHashParentIn, int nRevisionIn, std::string strNameIn, int64_t nTimeIn, uint256 nFeeTXHashIn)
@@ -574,6 +574,7 @@ CGovernanceObject::CGovernanceObject(uint256 nHashParentIn, int nRevisionIn, std
     fCachedValid = true;
     fCachedDelete = false;
     fCachedEndorsed = false;
+    //fDirtyCache = true;
 }
 
 CGovernanceObject::CGovernanceObject(const CGovernanceObject& other)
@@ -592,6 +593,7 @@ CGovernanceObject::CGovernanceObject(const CGovernanceObject& other)
     fCachedValid = other.fCachedValid;
     fCachedDelete = other.fCachedDelete;
     fCachedEndorsed = other.fCachedEndorsed;
+    //fDirtyCache = other.fDirtyCache;
 }
 
 bool CGovernanceObject::IsValid(const CBlockIndex* pindex, std::string& strError, bool fCheckCollateral)
diff --git a/src/governance.h b/src/governance.h
@@ -181,6 +181,7 @@ class CGovernanceObject
     bool fCachedValid; // true == minimum network has been reached flagging this object as a valid and understood goverance object (e.g, the serialized data is correct format, etc)
     bool fCachedDelete; // true == minimum network support has been reached saying this object should be deleted from the system entirely
     bool fCachedEndorsed; // true == minimum network support has been reached flagging this object as endorsed by an elected representative body (e.g. business review board / technecial review board /etc)
+    // bool fDirtyCache; // object was updated and cached values should be updated soon
 
     CGovernanceObject();
     CGovernanceObject(uint256 nHashParentIn, int nRevisionIn, std::string strNameIn, int64_t nTime, uint256 nFeeTXHashIn);
@@ -257,7 +258,6 @@ class CGovernanceObject
     void CleanAndRemove(bool fSignatureCheck);
     void Relay();
 
-
     uint256 GetHash(){
 
         // CREATE HASH OF ALL IMPORTANT PIECES OF DATA
