GUI: topbar, removing not used block source.

furszy · furszy · commit ef77fdf114c0 · 2021-03-11T17:18:08.000-03:00
ClientModel::getBlockSource is locking cs_nodes every second and the result is currently not used.
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
@@ -150,6 +150,11 @@ int64_t ClientModel::getLastBlockProcessedTime() const
     return cacheTip == nullptr ? Params().GenesisBlock().GetBlockTime() : cacheTip->GetBlockTime();
 }
 
+bool ClientModel::isTipCached() const
+{
+    return cacheTip;
+}
+
 double ClientModel::getVerificationProgress() const
 {
     return Checkpoints::GuessVerificationProgress(cacheTip);
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
@@ -68,6 +68,7 @@ class ClientModel : public QObject
     int getLastBlockProcessedHeight() const;
     int64_t getLastBlockProcessedTime() const;
     double getVerificationProgress() const;
+    bool isTipCached() const;
 
     quint64 getTotalBytesRecv() const;
     quint64 getTotalBytesSent() const;
diff --git a/src/qt/pivx/topbar.cpp b/src/qt/pivx/topbar.cpp
@@ -474,26 +474,7 @@ void TopBar::setNumBlocks(int count)
     if (!clientModel)
         return;
 
-    // Acquire current block source
-    enum BlockSource blockSource = clientModel->getBlockSource();
-    std::string text = "";
-    switch (blockSource) {
-        case BLOCK_SOURCE_NETWORK:
-            text = "Synchronizing..";
-            break;
-        case BLOCK_SOURCE_DISK:
-            text = "Importing blocks from disk..";
-            break;
-        case BLOCK_SOURCE_REINDEX:
-            text = "Reindexing blocks on disk..";
-            break;
-        case BLOCK_SOURCE_NONE:
-            // Case: not Importing, not Reindexing and no network connection
-            text = "No block source available..";
-            ui->pushButtonSync->setChecked(false);
-            break;
-    }
-
+    std::string text;
     bool needState = true;
     if (masternodeSync.IsBlockchainSynced()) {
         // chain synced
@@ -523,7 +504,7 @@ void TopBar::setNumBlocks(int count)
         Q_EMIT walletSynced(false);
     }
 
-    if (needState) {
+    if (needState && clientModel->isTipCached()) {
         // Represent time from last generated block in human readable text
         QDateTime lastBlockDate = clientModel->getLastBlockDate();
         QDateTime currentDate = QDateTime::currentDateTime();

Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,11 @@ int64_t ClientModel::getLastBlockProcessedTime() const`
`150`	`150`	`return cacheTip == nullptr ? Params().GenesisBlock().GetBlockTime() : cacheTip->GetBlockTime();`
`151`	`151`	`}`
`152`	`152`
	`153`	`+bool ClientModel::isTipCached() const`
	`154`	`+{`
	`155`	`+ return cacheTip;`
	`156`	`+}`
	`157`	`+`
`153`	`158`	`double ClientModel::getVerificationProgress() const`
`154`	`159`	`{`
`155`	`160`	`return Checkpoints::GuessVerificationProgress(cacheTip);`