Move height data into signals

Author: galpHub

divi/src/Node.cpp

@@ -989,8 +989,9 @@ bool CNode::DisconnectOldProtocol(int nVersionRequired, std::string strLastComma
     return IsFlaggedForDisconnection();
 }
 
-void CNode::PushVersion(int currentChainTipHeight)
+void CNode::PushVersion()
 {
+    const int currentChainTipHeight = *(nodeSignals_->GetHeight());
     /// when NTP implemented, change to just nTime = GetAdjustedTime()
     int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime());
     CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService("0.0.0.0", 0)));

divi/src/Node.h

@@ -345,7 +345,7 @@ class CNode
     void PushInventory(const CInv& inv);
     void AskFor(const CInv& inv);
 
-    void PushVersion(int currentChainTipHeight);
+    void PushVersion();
     void SetSporkCount(int nSporkCountIn);
     bool AreSporksSynced() const;
 

divi/src/NodeSignals.h

@@ -7,6 +7,7 @@ class CNodeState;
 // Signals for message handling
 class CNode;
 struct CNodeSignals {
+    boost::signals2::signal<int()> GetHeight;
     boost::signals2::signal<void(CNodeState&)> InitializeNode;
     boost::signals2::signal<void(NodeId)> FinalizeNode;
     boost::signals2::signal<bool(CNode*)> ProcessReceivedMessages;

divi/src/main.cpp

@@ -405,7 +405,7 @@ static bool SetPeerVersionAndServices(CCriticalSection& mainCriticalSection, CNo
 
     // Be shy and don't send version until we hear
     if (pfrom->fInbound)
-        pfrom->PushVersion(GetHeight());
+        pfrom->PushVersion();
 
     pfrom->fClient = !(pfrom->GetServices() & NODE_NETWORK);
 
@@ -1327,6 +1327,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
 void RegisterNodeSignals()
 {
     CNodeSignals& nodeSignals = GetNodeSignals();
+    nodeSignals.GetHeight.connect(&GetHeight);
     nodeSignals.InitializeNode.connect(&InitializeNode);
     nodeSignals.FinalizeNode.connect(&FinalizeNode);
     nodeSignals.ProcessReceivedMessages.connect(&ProcessReceivedMessages);
@@ -1338,6 +1339,7 @@ void RegisterNodeSignals()
 void UnregisterNodeSignals()
 {
     CNodeSignals& nodeSignals = GetNodeSignals();
+    nodeSignals.GetHeight.disconnect(&GetHeight);
     nodeSignals.InitializeNode.disconnect(&InitializeNode);
     nodeSignals.FinalizeNode.disconnect(&FinalizeNode);
     nodeSignals.ProcessReceivedMessages.disconnect(&ProcessReceivedMessages);

divi/src/main.h

@@ -13,7 +13,6 @@
 #endif
 class CNodeSignals;
 /** Get Current Chain Height with acquired lock **/
-int GetHeight();
 void RegisterNodeSignals();
 void UnregisterNodeSignals();
 CNodeSignals& GetNodeSignals();

divi/src/net.cpp

@@ -317,7 +317,7 @@ CNode* CreateNode(SOCKET socket, Args&&... args)
     NodeWithSocket* nodeWithSocket = new NodeWithSocket(socket,std::forward<Args>(args)...);
     CNode* pnode = nodeWithSocket->node();
     if (pnode->CommunicationChannelIsValid() && !pnode->fInbound)
-        pnode->PushVersion(GetHeight());
+        pnode->PushVersion();
 
     NodeManager::Instance().recordNode(nodeWithSocket);
     return pnode;