[GUI] Masternode creation wizard, creation fail event properly detailing the failure cause in the subsequent error dialog.

furszy · Fuzzbawls · commit fa73ae3df71b · 2020-01-11T15:43:28.000-08:00
Github-Pull: #1211 Rebased-From: fc9946c
diff --git a/src/qt/pivx/masternodewizarddialog.cpp b/src/qt/pivx/masternodewizarddialog.cpp
@@ -206,21 +206,22 @@ bool MasterNodeWizardDialog::createMN(){
 
         prepareStatus = walletModel->prepareTransaction(currentTransaction);
 
+        QString returnMsg = "Unknown error";
         // process prepareStatus and on error generate message shown to user
-        processSendCoinsReturn(prepareStatus,
+        returnMsg = processSendCoinsReturn(prepareStatus,
                                BitcoinUnits::formatWithUnit(walletModel->getOptionsModel()->getDisplayUnit(),
                                                             currentTransaction.getTransactionFee()),
                                true
         );
 
         if (prepareStatus.status != WalletModel::OK) {
-            returnStr = tr("Prepare master node failed..");
+            returnStr = tr("Prepare master node failed.\n\n%1\n").arg(returnMsg);
             return false;
         }
 
         WalletModel::SendCoinsReturn sendStatus = walletModel->sendCoins(currentTransaction);
         // process sendStatus and on error generate message shown to user
-        processSendCoinsReturn(sendStatus);
+        returnMsg = processSendCoinsReturn(sendStatus);
 
         if (sendStatus.status == WalletModel::OK) {
             // now change the conf
@@ -286,7 +287,7 @@ bool MasterNodeWizardDialog::createMN(){
                     }
                 }
                 if (indexOut == -1) {
-                    returnStr = tr("Invalid collaterall output index");
+                    returnStr = tr("Invalid collateral output index");
                     return false;
                 }
                 std::string indexOutStr = std::to_string(indexOut);
@@ -323,6 +324,8 @@ bool MasterNodeWizardDialog::createMN(){
             } else{
                 returnStr = tr("masternode.conf file doesn't exists");
             }
+        } else {
+            returnStr = tr("Cannot send collateral transaction.\n\n%1").arg(returnMsg);
         }
     }
     return false;
@@ -359,7 +362,7 @@ void MasterNodeWizardDialog::onBackClicked(){
     }
 }
 
-void MasterNodeWizardDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn& sendCoinsReturn, const QString& msgArg, bool fPrepare)
+QString MasterNodeWizardDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn& sendCoinsReturn, const QString& msgArg, bool fPrepare)
 {
     bool fAskForUnlock = false;
 
@@ -408,7 +411,7 @@ void MasterNodeWizardDialog::processSendCoinsReturn(const WalletModel::SendCoins
             // included to prevent a compiler warning.
         case WalletModel::OK:
         default:
-            return;
+            return msgParams.first;
     }
 
     // Unlock wallet if it wasn't fully unlocked already
@@ -419,11 +422,11 @@ void MasterNodeWizardDialog::processSendCoinsReturn(const WalletModel::SendCoins
         }
         else {
             // Wallet unlocked
-            return;
+            return msgParams.first;
         }
     }
 
-    inform(msgParams.first);
+    return msgParams.first;
 }
 
 void MasterNodeWizardDialog::inform(QString text){
diff --git a/src/qt/pivx/masternodewizarddialog.h b/src/qt/pivx/masternodewizarddialog.h
@@ -46,7 +46,7 @@ private slots:
     // Process WalletModel::SendCoinsReturn and generate a pair consisting
     // of a message and message flags for use in emit message().
     // Additional parameter msgArg can be used via .arg(msgArg).
-    void processSendCoinsReturn(const WalletModel::SendCoinsReturn& sendCoinsReturn, const QString& msgArg = QString(), bool fPrepare = false);
+    QString processSendCoinsReturn(const WalletModel::SendCoinsReturn& sendCoinsReturn, const QString& msgArg = QString(), bool fPrepare = false);
     void inform(QString text);
     void initBtn(std::initializer_list<QPushButton*> args);
 };

Original file line number	Diff line number	Diff line change
`@@ -206,21 +206,22 @@ bool MasterNodeWizardDialog::createMN(){`
`206`	`206`
`207`	`207`	`prepareStatus = walletModel->prepareTransaction(currentTransaction);`
`208`	`208`
	`209`	`+ QString returnMsg = "Unknown error";`
`209`	`210`	`// process prepareStatus and on error generate message shown to user`
`210`		`- processSendCoinsReturn(prepareStatus,`
	`211`	`+ returnMsg = processSendCoinsReturn(prepareStatus,`
`211`	`212`	`BitcoinUnits::formatWithUnit(walletModel->getOptionsModel()->getDisplayUnit(),`
`212`	`213`	`currentTransaction.getTransactionFee()),`
`213`	`214`	`true`
`214`	`215`	`);`
`215`	`216`
`216`	`217`	`if (prepareStatus.status != WalletModel::OK) {`
`217`		`- returnStr = tr("Prepare master node failed..");`
	`218`	`+ returnStr = tr("Prepare master node failed.\n\n%1\n").arg(returnMsg);`
`218`	`219`	`return false;`
`219`	`220`	`}`
`220`	`221`
`221`	`222`	`WalletModel::SendCoinsReturn sendStatus = walletModel->sendCoins(currentTransaction);`
`222`	`223`	`// process sendStatus and on error generate message shown to user`
`223`		`- processSendCoinsReturn(sendStatus);`
	`224`	`+ returnMsg = processSendCoinsReturn(sendStatus);`
`224`	`225`
`225`	`226`	`if (sendStatus.status == WalletModel::OK) {`
`226`	`227`	`// now change the conf`
`@@ -286,7 +287,7 @@ bool MasterNodeWizardDialog::createMN(){`
`286`	`287`	`}`
`287`	`288`	`}`
`288`	`289`	`if (indexOut == -1) {`
`289`		`- returnStr = tr("Invalid collaterall output index");`
	`290`	`+ returnStr = tr("Invalid collateral output index");`
`290`	`291`	`return false;`
`291`	`292`	`}`
`292`	`293`	`std::string indexOutStr = std::to_string(indexOut);`
`@@ -323,6 +324,8 @@ bool MasterNodeWizardDialog::createMN(){`
`323`	`324`	`} else{`
`324`	`325`	`returnStr = tr("masternode.conf file doesn't exists");`
`325`	`326`	`}`
	`327`	`+ } else {`
	`328`	`+ returnStr = tr("Cannot send collateral transaction.\n\n%1").arg(returnMsg);`
`326`	`329`	`}`
`327`	`330`	`}`
`328`	`331`	`return false;`
`@@ -359,7 +362,7 @@ void MasterNodeWizardDialog::onBackClicked(){`
`359`	`362`	`}`
`360`	`363`	`}`
`361`	`364`
`362`		`-void MasterNodeWizardDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn& sendCoinsReturn, const QString& msgArg, bool fPrepare)`
	`365`	`+QString MasterNodeWizardDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn& sendCoinsReturn, const QString& msgArg, bool fPrepare)`
`363`	`366`	`{`
`364`	`367`	`bool fAskForUnlock = false;`
`365`	`368`
`@@ -408,7 +411,7 @@ void MasterNodeWizardDialog::processSendCoinsReturn(const WalletModel::SendCoins`
`408`	`411`	`// included to prevent a compiler warning.`
`409`	`412`	`case WalletModel::OK:`
`410`	`413`	`default:`
`411`		`- return;`
	`414`	`+ return msgParams.first;`
`412`	`415`	`}`
`413`	`416`
`414`	`417`	`// Unlock wallet if it wasn't fully unlocked already`
`@@ -419,11 +422,11 @@ void MasterNodeWizardDialog::processSendCoinsReturn(const WalletModel::SendCoins`
`419`	`422`	`}`
`420`	`423`	`else {`
`421`	`424`	`// Wallet unlocked`
`422`		`- return;`
	`425`	`+ return msgParams.first;`
`423`	`426`	`}`
`424`	`427`	`}`
`425`	`428`
`426`		`- inform(msgParams.first);`
	`429`	`+ return msgParams.first;`
`427`	`430`	`}`
`428`	`431`
`429`	`432`	`void MasterNodeWizardDialog::inform(QString text){`