(fix) Refactor elseIf chains

InjectiveLabs · Oct 2, 2024 · b7a87c3 · b7a87c3
1 parent b077d21
commit b7a87c3
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/client/chain/chain.go b/client/chain/chain.go
@@ -845,11 +845,13 @@ func (c *chainClient) SyncBroadcastSignedTx(txBytes []byte) (*txtypes.BroadcastT
 		if errRes := client.CheckCometError(err, txBytes); errRes != nil {
 			return &txtypes.BroadcastTxResponse{TxResponse: errRes}, err
 		}
-	} else if resultTx.TxResult.Code != 0 {
+	}
+	if resultTx.TxResult.Code != 0 {
 		resResultTx := sdk.NewResponseResultTx(resultTx, res.TxResponse.Tx, res.TxResponse.Timestamp)
 		res = &txtypes.BroadcastTxResponse{TxResponse: resResultTx}
 		return res, errors.New(fmt.Sprintf("Failed with non-zero code %d", resultTx.TxResult.Code))
-	} else if resultTx.Height > 0 {
+	}
+	if resultTx.Height > 0 {
 		resResultTx := sdk.NewResponseResultTx(resultTx, res.TxResponse.Tx, res.TxResponse.Timestamp)
 		res = &txtypes.BroadcastTxResponse{TxResponse: resResultTx}
 		return res, err
@@ -873,11 +875,13 @@ func (c *chainClient) SyncBroadcastSignedTx(txBytes []byte) (*txtypes.BroadcastT
 				t.Reset(defaultBroadcastStatusPoll)
 				continue
 
-			} else if resultTx.TxResult.Code != 0 {
+			}
+			if resultTx.TxResult.Code != 0 {
 				resResultTx := sdk.NewResponseResultTx(resultTx, res.TxResponse.Tx, res.TxResponse.Timestamp)
 				res = &txtypes.BroadcastTxResponse{TxResponse: resResultTx}
 				return res, errors.New(fmt.Sprintf("Failed with non-zero code %d", resultTx.TxResult.Code))
-			} else if resultTx.Height > 0 {
+			}
+			if resultTx.Height > 0 {
 				resResultTx := sdk.NewResponseResultTx(resultTx, res.TxResponse.Tx, res.TxResponse.Timestamp)
 				res = &txtypes.BroadcastTxResponse{TxResponse: resResultTx}
 				return res, err
@@ -934,11 +938,13 @@ func (c *chainClient) broadcastTx(
 		if errRes := client.CheckCometError(err, txBytes); errRes != nil {
 			return &txtypes.BroadcastTxResponse{TxResponse: errRes}, err
 		}
-	} else if resultTx.TxResult.Code != 0 {
+	}
+	if resultTx.TxResult.Code != 0 {
 		resResultTx := sdk.NewResponseResultTx(resultTx, res.TxResponse.Tx, res.TxResponse.Timestamp)
 		res = &txtypes.BroadcastTxResponse{TxResponse: resResultTx}
 		return res, errors.New(fmt.Sprintf("Failed with non-zero code %d", resultTx.TxResult.Code))
-	} else if resultTx.Height > 0 {
+	}
+	if resultTx.Height > 0 {
 		resResultTx := sdk.NewResponseResultTx(resultTx, res.TxResponse.Tx, res.TxResponse.Timestamp)
 		res = &txtypes.BroadcastTxResponse{TxResponse: resResultTx}
 		return res, err
@@ -962,12 +968,14 @@ func (c *chainClient) broadcastTx(
 				t.Reset(defaultBroadcastStatusPoll)
 				continue
 
-			} else if resultTx.TxResult.Code != 0 {
+			}
+			if resultTx.TxResult.Code != 0 {
 				resResultTx := sdk.NewResponseResultTx(resultTx, res.TxResponse.Tx, res.TxResponse.Timestamp)
 				res = &txtypes.BroadcastTxResponse{TxResponse: resResultTx}
 				t.Stop()
 				return res, errors.New(fmt.Sprintf("Failed with non-zero code %d", resultTx.TxResult.Code))
-			} else if resultTx.Height > 0 {
+			}
+			if resultTx.Height > 0 {
 				resResultTx := sdk.NewResponseResultTx(resultTx, res.TxResponse.Tx, res.TxResponse.Timestamp)
 				res = &txtypes.BroadcastTxResponse{TxResponse: resResultTx}
 				t.Stop()