Refactor: remove duplicated coll. confirmation check in MNModel::data

random-zebra · furszy · commit 5f9aac4c0096 · 2021-09-19T14:05:42.000-03:00
Github-Pull: #2530 Rebased-From: f0fd8ac
diff --git a/src/qt/pivx/mnmodel.cpp b/src/qt/pivx/mnmodel.cpp
@@ -106,12 +106,7 @@ QVariant MNModel::data(const QModelIndex &index, int role) const
                 return "Not available";
             }
             case WAS_COLLATERAL_ACCEPTED:{
-                if (!isAvailable) return false;
-                std::string txHash = rec->vin.prevout.hash.GetHex();
-                if (!collateralTxAccepted.value(txHash) && walletModel) {
-                    return walletModel->getWalletTxDepth(rec->vin.prevout.hash) > 0;
-                }
-                return true;
+                return isAvailable && collateralTxAccepted.value(rec->vin.prevout.hash.GetHex());
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -106,12 +106,7 @@ QVariant MNModel::data(const QModelIndex &index, int role) const`
`106`	`106`	`return "Not available";`
`107`	`107`	`}`
`108`	`108`	`case WAS_COLLATERAL_ACCEPTED:{`
`109`		`- if (!isAvailable) return false;`
`110`		`- std::string txHash = rec->vin.prevout.hash.GetHex();`
`111`		`- if (!collateralTxAccepted.value(txHash) && walletModel) {`
`112`		`- return walletModel->getWalletTxDepth(rec->vin.prevout.hash) > 0;`
`113`		`- }`
`114`		`- return true;`
	`109`	`+ return isAvailable && collateralTxAccepted.value(rec->vin.prevout.hash.GetHex());`
`115`	`110`	`}`
`116`	`111`	`}`
`117`	`112`	`}`