refactor: rename DsegUpdate to RequestMnList

furszy · furszy · commit bf345853fac6 · 2021-10-27T11:50:36.000-03:00
diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
@@ -379,7 +379,7 @@ bool CMasternodeSync::SyncWithNode(CNode* pnode, bool fLegacyMnObsolete)
             if (pnode->HasFulfilledRequest("mnsync")) return true;
 
             // Try to request MN list sync.
-            if (!mnodeman.DsegUpdate(pnode)) {
+            if (!mnodeman.RequestMnList(pnode)) {
                 return true; // Failed, try next peer.
             }
 
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
@@ -438,7 +438,7 @@ int CMasternodeMan::CountEnabled(bool only_legacy) const
     return count_enabled;
 }
 
-bool CMasternodeMan::DsegUpdate(CNode* pnode)
+bool CMasternodeMan::RequestMnList(CNode* pnode)
 {
     // Skip after legacy obsolete. !TODO: remove when transition to DMN is complete
     if (deterministicMNManager->LegacyMNObsolete()) {
@@ -459,7 +459,7 @@ bool CMasternodeMan::DsegUpdate(CNode* pnode)
     }
 
     g_connman->PushMessage(pnode, CNetMsgMaker(pnode->GetSendVersion()).Make(NetMsgType::GETMNLIST, CTxIn()));
-    int64_t askAgain = GetTime() + MASTERNODES_DSEG_SECONDS;
+    int64_t askAgain = GetTime() + MASTERNODES_REQUEST_SECONDS;
     mWeAskedForMasternodeList[pnode->addr] = askAgain;
     return true;
 }
@@ -909,7 +909,7 @@ int CMasternodeMan::ProcessGetMNList(CNode* pfrom, CTxIn& vin)
                 return 20;
             }
         }
-        int64_t askAgain = GetTime() + MASTERNODES_DSEG_SECONDS;
+        int64_t askAgain = GetTime() + MASTERNODES_REQUEST_SECONDS;
         mAskedUsForMasternodeList[pfrom->addr] = askAgain;
     }
 
diff --git a/src/masternodeman.h b/src/masternodeman.h
@@ -15,7 +15,7 @@
 #include "sync.h"
 #include "util/system.h"
 
-#define MASTERNODES_DSEG_SECONDS (60 * 60) // One hour.
+#define MASTERNODES_REQUEST_SECONDS (60 * 60) // One hour.
 
 /** Maximum number of block hashes to cache */
 static const unsigned int CACHED_BLOCK_HASHES = 200;
@@ -130,7 +130,7 @@ class CMasternodeMan
 
     int CountEnabled(bool only_legacy = false) const;
 
-    bool DsegUpdate(CNode* pnode);
+    bool RequestMnList(CNode* pnode);
 
     /// Find an entry
     CMasternode* Find(const COutPoint& collateralOut);

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ bool CMasternodeSync::SyncWithNode(CNode* pnode, bool fLegacyMnObsolete)`
`379`	`379`	`if (pnode->HasFulfilledRequest("mnsync")) return true;`
`380`	`380`
`381`	`381`	`// Try to request MN list sync.`
`382`		`- if (!mnodeman.DsegUpdate(pnode)) {`
	`382`	`+ if (!mnodeman.RequestMnList(pnode)) {`
`383`	`383`	`return true; // Failed, try next peer.`
`384`	`384`	`}`
`385`	`385`
Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ int CMasternodeMan::CountEnabled(bool only_legacy) const`
`438`	`438`	`return count_enabled;`
`439`	`439`	`}`
`440`	`440`
`441`		`-bool CMasternodeMan::DsegUpdate(CNode* pnode)`
	`441`	`+bool CMasternodeMan::RequestMnList(CNode* pnode)`
`442`	`442`	`{`
`443`	`443`	`// Skip after legacy obsolete. !TODO: remove when transition to DMN is complete`
`444`	`444`	`if (deterministicMNManager->LegacyMNObsolete()) {`
`@@ -459,7 +459,7 @@ bool CMasternodeMan::DsegUpdate(CNode* pnode)`
`459`	`459`	`}`
`460`	`460`
`461`	`461`	`g_connman->PushMessage(pnode, CNetMsgMaker(pnode->GetSendVersion()).Make(NetMsgType::GETMNLIST, CTxIn()));`
`462`		`- int64_t askAgain = GetTime() + MASTERNODES_DSEG_SECONDS;`
	`462`	`+ int64_t askAgain = GetTime() + MASTERNODES_REQUEST_SECONDS;`
`463`	`463`	`mWeAskedForMasternodeList[pnode->addr] = askAgain;`
`464`	`464`	`return true;`
`465`	`465`	`}`
`@@ -909,7 +909,7 @@ int CMasternodeMan::ProcessGetMNList(CNode* pfrom, CTxIn& vin)`
`909`	`909`	`return 20;`
`910`	`910`	`}`
`911`	`911`	`}`
`912`		`- int64_t askAgain = GetTime() + MASTERNODES_DSEG_SECONDS;`
	`912`	`+ int64_t askAgain = GetTime() + MASTERNODES_REQUEST_SECONDS;`
`913`	`913`	`mAskedUsForMasternodeList[pfrom->addr] = askAgain;`
`914`	`914`	`}`
`915`	`915`