qt, wallet, refactor: Make WalletModel::sendCoins() return void

hebasto · hebasto · commit 1f653dc2623e · 2022-05-29T17:49:55.000+02:00
Currently, the `WalletModel::sendCoins()` function always returns the
same value.

Also dead and noop code has been removed.
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
@@ -543,15 +543,8 @@ void SendCoinsDialog::sendButtonClicked([[maybe_unused]] bool checked)
         // failed, or more signatures are needed.
         if (broadcast) {
             // now send the prepared transaction
-            WalletModel::SendCoinsReturn sendStatus = model->sendCoins(*m_current_transaction);
-            // process sendStatus and on error generate message shown to user
-            processSendCoinsReturn(sendStatus);
-
-            if (sendStatus.status == WalletModel::OK) {
-                Q_EMIT coinsSent(m_current_transaction->getWtx()->GetHash());
-            } else {
-                send_failure = true;
-            }
+            model->sendCoins(*m_current_transaction);
+            Q_EMIT coinsSent(m_current_transaction->getWtx()->GetHash());
         }
     }
     if (!send_failure) {
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -234,7 +234,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact
     return SendCoinsReturn(OK);
 }
 
-WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &transaction)
+void WalletModel::sendCoins(WalletModelTransaction& transaction)
 {
     QByteArray transaction_array; /* store serialized transaction */
 
@@ -280,8 +280,6 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
     }
 
     checkBalanceChanged(m_wallet->getBalances()); // update balance immediately, otherwise there could be a short noticeable delay until pollBalanceChanged hits
-
-    return SendCoinsReturn(OK);
 }
 
 OptionsModel* WalletModel::getOptionsModel() const
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
@@ -103,7 +103,7 @@ class WalletModel : public QObject
     SendCoinsReturn prepareTransaction(WalletModelTransaction &transaction, const wallet::CCoinControl& coinControl);
 
     // Send coins to a list of recipients
-    SendCoinsReturn sendCoins(WalletModelTransaction &transaction);
+    void sendCoins(WalletModelTransaction& transaction);
 
     // Wallet encryption
     bool setWalletEncrypted(const SecureString& passphrase);

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact`
`234`	`234`	`return SendCoinsReturn(OK);`
`235`	`235`	`}`
`236`	`236`
`237`		`-WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &transaction)`
	`237`	`+void WalletModel::sendCoins(WalletModelTransaction& transaction)`
`238`	`238`	`{`
`239`	`239`	`QByteArray transaction_array; /* store serialized transaction */`
`240`	`240`
`@@ -280,8 +280,6 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`checkBalanceChanged(m_wallet->getBalances()); // update balance immediately, otherwise there could be a short noticeable delay until pollBalanceChanged hits`
`283`		`-`
`284`		`- return SendCoinsReturn(OK);`
`285`	`283`	`}`
`286`	`284`
`287`	`285`	`OptionsModel* WalletModel::getOptionsModel() const`