abstract out blocksBehind() method

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 590bef339fe3f972aca707b9d82abbd050bf43c3..1f11f77a81b09fc7144198180a453491d808f991 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -864,9 +864,15 @@ void MainWindow::setPausedSyncStatus() {
     QString status = Utils::getPausedSyncStatus(m_wallet, m_nodes, &tooltip);
 
     if (m_wallet) {
-        qDebug() << "Paused Status Calc: WalletHeight:" << m_wallet->blockChainHeight()
-                 << "DaemonHeight:" << m_wallet->daemonBlockChainHeight()
-                 << "TargetHeight:" << m_wallet->daemonBlockChainTargetHeight();
+        quint64 daemonHeight = m_wallet->daemonBlockChainHeight();
+        quint64 walletHeight = m_wallet->blockChainHeight();
+        quint64 targetHeight = m_wallet->daemonBlockChainTargetHeight();
+        quint64 blocksBehind = Utils::blocksBehind(walletHeight, targetHeight);
+
+        qDebug() << "Paused Status Calc: WalletHeight:" << walletHeight
+                 << "DaemonHeight:" << daemonHeight
+                 << "TargetHeight:" << targetHeight
+                 << "BlocksBehind:" << blocksBehind;
     }
 
     this->setStatusText(status);
@@ -990,9 +996,9 @@ void MainWindow::onSyncStatus(quint64 height, quint64 target, bool daemonSync) {
         this->updateNetStats();
         this->setStatusText(QString("Synchronized (%1)").arg(QLocale().toString(height)));
     } else {
-        quint64 blocksLeft = (target > height) ? (target - height) : 0;
+        quint64 blocksBehind = Utils::blocksBehind(height, target);
         QString type = daemonSync ? tr("Blockchain") : tr("Wallet");
-        QString blocksStr = QLocale().toString(blocksLeft);
+        QString blocksStr = QLocale().toString(blocksBehind);
         this->setStatusText(tr("%1 sync: %2 blocks behind").arg(type, blocksStr));
     }
     m_statusLabelStatus->setToolTip(tr("Wallet Height: %1 | Network Tip: %2")

diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp
index f6b82b386752ff03ba20f062b6003724ec6e500e..323c4dda10f050e443107e888dd8362aeac41d4f 100644 (file)
--- a/src/utils/Utils.cpp
+++ b/src/utils/Utils.cpp
@@ -717,6 +717,10 @@ void clearLayout(QLayout* layout, bool deleteWidgets)
     }
 }
 
+quint64 blocksBehind(quint64 height, quint64 target) {
+    return (target > height) ? (target - height) : 0;
+}
+
 QString formatSyncStatus(quint64 height, quint64 target, bool daemonSync) {
     if (height < (target - 1)) {
         QString blocks = (target >= height) ? QString::number(target - height) : "?";
@@ -775,7 +779,7 @@ QString getPausedSyncStatus(Wallet *wallet, Nodes *nodes, QString *tooltip) {
         if (tooltip) {
             *tooltip = QObject::tr("Wallet Height: %1 | Network Tip: %2").arg(walletHeight).arg(daemonHeight);
         }
-        quint64 blocksBehind = (daemonHeight > startHeight) ? (daemonHeight - startHeight) : 0;
+        quint64 blocksBehind = Utils::blocksBehind(startHeight, daemonHeight);
         if (blocksBehind == 0) {
             return QObject::tr("[PAUSED] Sync paused");
         }

diff --git a/src/utils/Utils.h b/src/utils/Utils.h
index 2f29bfc3e3ceec33cea3c9801653528a2c253c41..3a750aa9956ff678f471f56c32bc89ec98609c81 100644 (file)
--- a/src/utils/Utils.h
+++ b/src/utils/Utils.h
@@ -120,6 +120,7 @@ namespace Utils
     QWindow* windowForQObject(QObject* object);
     void clearLayout(QLayout *layout, bool deleteWidgets = true);
 
+    quint64 blocksBehind(quint64 height, quint64 target);
     QString formatSyncStatus(quint64 height, quint64 target, bool daemonSync = false);
     QString formatSyncTimeEstimate(quint64 blocks);
     quint64 estimateSyncDataSize(quint64 blocks);