[Refactoring][GUI] remove pwalletMain direct access in mnmodel

random-zebra · random-zebra · commit beb1cf61f7d5 · 2021-04-14T09:03:15.000+02:00
diff --git a/src/qt/pivx/masternodeswidget.cpp b/src/qt/pivx/masternodeswidget.cpp
@@ -77,7 +77,7 @@ MasterNodesWidget::MasterNodesWidget(PIVXGUI *parent) :
             new MNHolder(isLightTheme()),
             this
     );
-    mnModel = new MNModel(this);
+    mnModel = new MNModel(this, walletModel);
 
     this->setStyleSheet(parent->styleSheet());
 
diff --git a/src/qt/pivx/mnmodel.cpp b/src/qt/pivx/mnmodel.cpp
@@ -12,7 +12,9 @@
 #include "uint256.h"
 #include "wallet/wallet.h"
 
-MNModel::MNModel(QObject *parent) : QAbstractTableModel(parent)
+MNModel::MNModel(QObject *parent, WalletModel* _model) :
+    QAbstractTableModel(parent),
+    walletModel(_model)
 {
     updateMNList();
 }
@@ -34,11 +36,8 @@ void MNModel::updateMNList()
             pmn->vin = txIn;
         }
         nodes.insert(QString::fromStdString(mne.getAlias()), std::make_pair(QString::fromStdString(mne.getIp()), pmn));
-        if (pwalletMain) {
-            const CWalletTx *walletTx = pwalletMain->GetWalletTx(txHash);
-            bool txAccepted = walletTx &&
-                    WITH_LOCK(pwalletMain->cs_wallet, return walletTx->GetDepthInMainChain()) >= MasternodeCollateralMinConf();
-            collateralTxAccepted.insert(mne.getTxHash(), txAccepted);
+        if (walletModel) {
+            collateralTxAccepted.insert(mne.getTxHash(), walletModel->getWalletTxDepth(txHash) >= MasternodeCollateralMinConf());
         }
     }
     Q_EMIT dataChanged(index(0, 0, QModelIndex()), index(end, 5, QModelIndex()) );
@@ -109,9 +108,8 @@ QVariant MNModel::data(const QModelIndex &index, int role) const
             case WAS_COLLATERAL_ACCEPTED:{
                 if (!isAvailable) return false;
                 std::string txHash = rec->vin.prevout.hash.GetHex();
-                if (!collateralTxAccepted.value(txHash)) {
-                    const CWalletTx *walletTx = pwalletMain->GetWalletTx(rec->vin.prevout.hash);
-                    return walletTx && WITH_LOCK(pwalletMain->cs_wallet, return walletTx->GetDepthInMainChain()) > 0;
+                if (!collateralTxAccepted.value(txHash) && walletModel) {
+                    return walletModel->getWalletTxDepth(rec->vin.prevout.hash) > 0;
                 }
                 return true;
             }
diff --git a/src/qt/pivx/mnmodel.h b/src/qt/pivx/mnmodel.h
@@ -8,13 +8,14 @@
 #include <QAbstractTableModel>
 #include "masternode.h"
 #include "masternodeconfig.h"
+#include "qt/walletmodel.h"
 
 class MNModel : public QAbstractTableModel
 {
     Q_OBJECT
 
 public:
-    explicit MNModel(QObject *parent = nullptr);
+    explicit MNModel(QObject *parent, WalletModel* _model);
     ~MNModel() override {
         nodes.clear();
         collateralTxAccepted.clear();
@@ -56,6 +57,7 @@ class MNModel : public QAbstractTableModel
 
 
 private:
+    WalletModel* walletModel;
     // alias mn node ---> pair <ip, master node>
     QMap<QString, std::pair<QString, CMasternode*>> nodes;
     QMap<std::string, bool> collateralTxAccepted;
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -1020,6 +1020,17 @@ bool WalletModel::getMNCollateralCandidate(COutPoint& outPoint)
     return false;
 }
 
+// Depth of a wallet transaction or -1 if not found
+int WalletModel::getWalletTxDepth(const uint256& txHash) const
+{
+    const CWalletTx *walletTx = wallet->GetWalletTx(txHash);
+    if (!walletTx) {
+        return -1;
+    }
+    LOCK(wallet->cs_wallet);
+    return walletTx->GetDepthInMainChain();
+}
+
 bool WalletModel::isSpent(const COutPoint& outpoint) const
 {
     LOCK(wallet->cs_wallet);
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
@@ -295,6 +295,8 @@ class WalletModel : public QObject
     bool IsShieldedDestination(const CWDestination& address);
     bool isUsed(CTxDestination address);
     bool getMNCollateralCandidate(COutPoint& outPoint);
+    // Depth of a wallet transaction or -1 if not found
+    int getWalletTxDepth(const uint256& txHash) const;
     bool isSpent(const COutPoint& outpoint) const;
 
     class ListCoinsKey {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,9 @@`
`12`	`12`	`#include "uint256.h"`
`13`	`13`	`#include "wallet/wallet.h"`
`14`	`14`
`15`		`-MNModel::MNModel(QObject *parent) : QAbstractTableModel(parent)`
	`15`	`+MNModel::MNModel(QObject parent, WalletModel _model) :`
	`16`	`+ QAbstractTableModel(parent),`
	`17`	`+ walletModel(_model)`
`16`	`18`	`{`
`17`	`19`	`updateMNList();`
`18`	`20`	`}`
`@@ -34,11 +36,8 @@ void MNModel::updateMNList()`
`34`	`36`	`pmn->vin = txIn;`
`35`	`37`	`}`
`36`	`38`	`nodes.insert(QString::fromStdString(mne.getAlias()), std::make_pair(QString::fromStdString(mne.getIp()), pmn));`
`37`		`- if (pwalletMain) {`
`38`		`- const CWalletTx *walletTx = pwalletMain->GetWalletTx(txHash);`
`39`		`- bool txAccepted = walletTx &&`
`40`		`- WITH_LOCK(pwalletMain->cs_wallet, return walletTx->GetDepthInMainChain()) >= MasternodeCollateralMinConf();`
`41`		`- collateralTxAccepted.insert(mne.getTxHash(), txAccepted);`
	`39`	`+ if (walletModel) {`
	`40`	`+ collateralTxAccepted.insert(mne.getTxHash(), walletModel->getWalletTxDepth(txHash) >= MasternodeCollateralMinConf());`
`42`	`41`	`}`
`43`	`42`	`}`
`44`	`43`	`Q_EMIT dataChanged(index(0, 0, QModelIndex()), index(end, 5, QModelIndex()) );`
`@@ -109,9 +108,8 @@ QVariant MNModel::data(const QModelIndex &index, int role) const`
`109`	`108`	`case WAS_COLLATERAL_ACCEPTED:{`
`110`	`109`	`if (!isAvailable) return false;`
`111`	`110`	`std::string txHash = rec->vin.prevout.hash.GetHex();`
`112`		`- if (!collateralTxAccepted.value(txHash)) {`
`113`		`- const CWalletTx *walletTx = pwalletMain->GetWalletTx(rec->vin.prevout.hash);`
`114`		`- return walletTx && WITH_LOCK(pwalletMain->cs_wallet, return walletTx->GetDepthInMainChain()) > 0;`
	`111`	`+ if (!collateralTxAccepted.value(txHash) && walletModel) {`
	`112`	`+ return walletModel->getWalletTxDepth(rec->vin.prevout.hash) > 0;`
`115`	`113`	`}`
`116`	`114`	`return true;`
`117`	`115`	`}`