[din] Show total enabled nodes in info tab

SINOVATEblockchain · Nov 29, 2020 · 72bda79 · 72bda79
1 parent 84cfaa8
commit 72bda79
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
@@ -26,6 +26,7 @@
 // Dash
 #include <masternodeman.h>
 #include <masternode-sync.h>
+#include <infinitynodeman.h>
 #include <instantx.h>
 //
 
@@ -82,19 +83,11 @@ int ClientModel::getNumConnections(unsigned int flags) const
     return m_node.getNodeCount(connections);
 }
 
-// Dash
-QString ClientModel::getMasternodeCountString() const
+QString ClientModel::getInfinitynodeCountString() const
 {
-    // return tr("Total: %1 (PS compatible: %2 / Enabled: %3) (IPv4: %4, IPv6: %5, TOR: %6)").arg(QString::number((int)mnodeman.size()))
-    return tr("Total: %1 (PS compatible: %2 / Enabled: %3)")
-            .arg(QString::number((int)mnodeman.size()))
-            .arg(QString::number((int)mnodeman.CountEnabled(MIN_INSTANTSEND_PROTO_VERSION)))
-            .arg(QString::number((int)mnodeman.CountEnabled()));
-            // .arg(QString::number((int)mnodeman.CountByIP(NET_IPV4)))
-            // .arg(QString::number((int)mnodeman.CountByIP(NET_IPV6)))
-            // .arg(QString::number((int)mnodeman.CountByIP(NET_TOR)));
+    return tr("Total: %1")
+            .arg(QString::number((int)infnodeman.Count()));
 }
-//
 
 int ClientModel::getNumBlocks() const
 {
@@ -141,7 +134,7 @@ void ClientModel::updateTimer()
 // Dash
 void ClientModel::updateMnTimer()
 {
-    QString newMasternodeCountString = getMasternodeCountString();
+    QString newMasternodeCountString = getInfinitynodeCountString();
 
     if (cachedMasternodeCountString != newMasternodeCountString)
     {

diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
@@ -57,7 +57,7 @@ class ClientModel : public QObject
     //! Return number of connections, default is in- and outbound (total)
     int getNumConnections(unsigned int flags = CONNECTIONS_ALL) const;
     // Dash
-    QString getMasternodeCountString() const;
+    QString getInfinitynodeCountString() const;
     int getNumBlocks() const;
     //
     int getHeaderTipHeight() const;

diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -575,7 +575,7 @@ void RPCConsole::setClientModel(ClientModel *model)
         connect(model, SIGNAL(networkActiveChanged(bool)), this, SLOT(setNetworkActive(bool)));
 
         // Dash
-        setMasternodeCount(model->getMasternodeCountString());
+        setMasternodeCount(model->getInfinitynodeCountString());
         connect(model, SIGNAL(strMasternodesChanged(QString)), this, SLOT(setMasternodeCount(QString)));
         //