RPCConsole, take initial chaintip data as parameter

jonasschnelli · jonasschnelli · commit 25e1d0bf4172 · 2020-08-12T16:31:23.000+02:00
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -556,7 +556,7 @@ bool RPCConsole::eventFilter(QObject* obj, QEvent *event)
     return QWidget::eventFilter(obj, event);
 }
 
-void RPCConsole::setClientModel(ClientModel *model)
+void RPCConsole::setClientModel(ClientModel *model, int bestblock_height, int64_t bestblock_date, double verification_progress)
 {
     clientModel = model;
 
@@ -576,13 +576,13 @@ void RPCConsole::setClientModel(ClientModel *model)
         setNumConnections(model->getNumConnections());
         connect(model, &ClientModel::numConnectionsChanged, this, &RPCConsole::setNumConnections);
 
-        interfaces::Node& node = clientModel->node();
-        setNumBlocks(node.getNumBlocks(), QDateTime::fromTime_t(node.getLastBlockTime()), node.getVerificationProgress(), false);
+        setNumBlocks(bestblock_height, QDateTime::fromTime_t(bestblock_date), verification_progress, false);
         connect(model, &ClientModel::numBlocksChanged, this, &RPCConsole::setNumBlocks);
 
         updateNetworkState();
         connect(model, &ClientModel::networkActiveChanged, this, &RPCConsole::setNetworkActive);
 
+        interfaces::Node& node = clientModel->node();
         updateTrafficStats(node.getTotalBytesRecv(), node.getTotalBytesSent());
         connect(model, &ClientModel::bytesChanged, this, &RPCConsole::updateTrafficStats);
 
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
@@ -46,7 +46,7 @@ class RPCConsole: public QWidget
         return RPCParseCommandLine(&node, strResult, strCommand, true, pstrFilteredOut, wallet_model);
     }
 
-    void setClientModel(ClientModel *model);
+    void setClientModel(ClientModel *model = nullptr, int bestblock_height = 0, int64_t bestblock_date = 0, double verification_progress = 0.0);
     void addWallet(WalletModel * const walletModel);
     void removeWallet(WalletModel* const walletModel);
 

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class RPCConsole: public QWidget`
`46`	`46`	`return RPCParseCommandLine(&node, strResult, strCommand, true, pstrFilteredOut, wallet_model);`
`47`	`47`	`}`
`48`	`48`
`49`		`- void setClientModel(ClientModel *model);`
	`49`	`+ void setClientModel(ClientModel *model = nullptr, int bestblock_height = 0, int64_t bestblock_date = 0, double verification_progress = 0.0);`
`50`	`50`	`void addWallet(WalletModel * const walletModel);`
`51`	`51`	`void removeWallet(WalletModel* const walletModel);`
`52`	`52`