Switch transaction table to use wallet height not node height

ryanofsky · ryanofsky · commit 83f69fab3a1a · 2020-05-01T06:59:09.000-04:00
Tweak of bitcoin#17905 to make gui display of transactions and balances more consistent. This change shouldn't cause visible effects in normal cases, just make GUI wallet code more internally correct and consistent.
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
@@ -664,7 +664,7 @@ QVariant TransactionTableModel::headerData(int section, Qt::Orientation orientat
 QModelIndex TransactionTableModel::index(int row, int column, const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
-    TransactionRecord *data = priv->index(walletModel->wallet(), walletModel->clientModel().getNumBlocks(), row);
+    TransactionRecord *data = priv->index(walletModel->wallet(), walletModel->getNumBlocks(), row);
     if(data)
     {
         return createIndex(row, column, data);
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
@@ -144,7 +144,7 @@ class WalletModel : public QObject
 
     interfaces::Node& node() const { return m_node; }
     interfaces::Wallet& wallet() const { return *m_wallet; }
-    ClientModel& clientModel() const { return m_client_model; }
+    int getNumBlocks() const { return cachedNumBlocks; }
 
     QString getWalletName() const;
     QString getDisplayName() const;

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ QVariant TransactionTableModel::headerData(int section, Qt::Orientation orientat`
`664`	`664`	`QModelIndex TransactionTableModel::index(int row, int column, const QModelIndex &parent) const`
`665`	`665`	`{`
`666`	`666`	`Q_UNUSED(parent);`
`667`		`- TransactionRecord *data = priv->index(walletModel->wallet(), walletModel->clientModel().getNumBlocks(), row);`
	`667`	`+ TransactionRecord *data = priv->index(walletModel->wallet(), walletModel->getNumBlocks(), row);`
`668`	`668`	`if(data)`
`669`	`669`	`{`
`670`	`670`	`return createIndex(row, column, data);`