refactor: rename DsegUpdate to RequestMnList

furszy · furszy · commit 9ea042cee233 · 2021-10-27T15:23:59.000-03:00
diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
@@ -368,7 +368,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
@@ -421,7 +421,7 @@ int CMasternodeMan::CountNetworks(int& ipv4, int& ipv6, int& onion) const
     return mapMasternodes.size();
 }
 
-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()) {
@@ -442,7 +442,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;
 }
@@ -827,7 +827,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
     /// Count the number of nodes with a specific proto version for each network. Return the total.
     int CountNetworks(int& ipv4, int& ipv6, int& onion) 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
`@@ -368,7 +368,7 @@ bool CMasternodeSync::SyncWithNode(CNode* pnode, bool fLegacyMnObsolete)`
`368`	`368`	`if (pnode->HasFulfilledRequest("mnsync")) return true;`
`369`	`369`
`370`	`370`	`// Try to request MN list sync.`
`371`		`- if (!mnodeman.DsegUpdate(pnode)) {`
	`371`	`+ if (!mnodeman.RequestMnList(pnode)) {`
`372`	`372`	`return true; // Failed, try next peer.`
`373`	`373`	`}`
`374`	`374`
Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ int CMasternodeMan::CountNetworks(int& ipv4, int& ipv6, int& onion) const`
`421`	`421`	`return mapMasternodes.size();`
`422`	`422`	`}`
`423`	`423`
`424`		`-bool CMasternodeMan::DsegUpdate(CNode* pnode)`
	`424`	`+bool CMasternodeMan::RequestMnList(CNode* pnode)`
`425`	`425`	`{`
`426`	`426`	`// Skip after legacy obsolete. !TODO: remove when transition to DMN is complete`
`427`	`427`	`if (deterministicMNManager->LegacyMNObsolete()) {`
`@@ -442,7 +442,7 @@ bool CMasternodeMan::DsegUpdate(CNode* pnode)`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`g_connman->PushMessage(pnode, CNetMsgMaker(pnode->GetSendVersion()).Make(NetMsgType::GETMNLIST, CTxIn()));`
`445`		`- int64_t askAgain = GetTime() + MASTERNODES_DSEG_SECONDS;`
	`445`	`+ int64_t askAgain = GetTime() + MASTERNODES_REQUEST_SECONDS;`
`446`	`446`	`mWeAskedForMasternodeList[pnode->addr] = askAgain;`
`447`	`447`	`return true;`
`448`	`448`	`}`
`@@ -827,7 +827,7 @@ int CMasternodeMan::ProcessGetMNList(CNode* pfrom, CTxIn& vin)`
`827`	`827`	`return 20;`
`828`	`828`	`}`
`829`	`829`	`}`
`830`		`- int64_t askAgain = GetTime() + MASTERNODES_DSEG_SECONDS;`
	`830`	`+ int64_t askAgain = GetTime() + MASTERNODES_REQUEST_SECONDS;`
`831`	`831`	`mAskedUsForMasternodeList[pfrom->addr] = askAgain;`
`832`	`832`	`}`
`833`	`833`