Merge pull request #174 from XRPLF/xrpl/fix/wait-transaction-retries

[TA-6038]: fix waitForTransaction retries

Author: GuillemGarciaDev

xrpl/websocket/client.go

@@ -365,18 +365,20 @@ func (c *Client) waitForTransaction(txHash string, lastLedgerSequence uint32) (*
 		res, err := c.Request(&requests.TxRequest{
 			Transaction: txHash,
 		})
-		if err != nil {
+		if err != nil && !strings.Contains(err.Error(), txnNotFound) {
 			return nil, err
 		}
 
-		err = res.GetResult(&txResponse)
-		if err != nil {
-			return nil, err
-		}
+		if res != nil {
+			err = res.GetResult(&txResponse)
+			if err != nil {
+				return nil, err
+			}
 
-		// Check if the transaction has been included in the current ledger
-		if txResponse.LedgerIndex.Int() >= int(lastLedgerSequence) {
-			break
+			// Check if the transaction has been included in the current ledger
+			if txResponse.LedgerIndex.Int() >= int(lastLedgerSequence) {
+				break
+			}
 		}
 
 		// Wait for the retry delay before retrying
@@ -731,10 +733,10 @@ func (c *Client) handleStream(t streamtypes.Type, message []byte) {
 			c.ledgerClosedChan <- &ledger
 		}
 	case streamtypes.TransactionStreamType:
-		var transaction streamtypes.TransactionStream
-		c.unmarshalMessage(message, &transaction)
+		var transactionStream streamtypes.TransactionStream
+		c.unmarshalMessage(message, &transactionStream)
 		if c.transactionChan != nil {
-			c.transactionChan <- &transaction
+			c.transactionChan <- &transactionStream
 		}
 	case streamtypes.ValidationStreamType:
 		var validation streamtypes.ValidationStream

xrpl/websocket/client_test.go

@@ -16,34 +16,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestClient_Connect(t *testing.T) {
-	ws := NewClient(NewClientConfig().WithHost("wss://s.altnet.rippletest.net"))
-	err := ws.Connect()
-	require.NoError(t, err)
-	require.True(t, ws.IsConnected())
-	ws.Disconnect()
-	require.False(t, ws.IsConnected())
-}
-
-func TestClient_Disconnect(t *testing.T) {
-	ws := NewClient(NewClientConfig().WithHost("wss://s.altnet.rippletest.net"))
-	ws.Connect()
-	require.True(t, ws.IsConnected())
-	ws.Disconnect()
-	require.False(t, ws.IsConnected())
-}
-
-func TestClient_IsConnected(t *testing.T) {
-	ws := NewClient(NewClientConfig().WithHost("wss://s.altnet.rippletest.net"))
-	require.False(t, ws.IsConnected())
-	err := ws.Connect()
-	require.NoError(t, err)
-	require.True(t, ws.IsConnected())
-	err = ws.Disconnect()
-	require.NoError(t, err)
-	require.False(t, ws.IsConnected())
-}
-
 func TestClient_SendRequest(t *testing.T) {
 	tt := []struct {
 		description    string
@@ -936,8 +908,6 @@ func TestClient_setLastLedgerSequence(t *testing.T) {
 					t.Errorf("Expected tx %v, but got %v", tt.expectedTx, tt.tx)
 				}
 			}
-
-			cl.Disconnect()
 		})
 	}
 }
@@ -999,8 +969,6 @@ func TestClient_checkAccountDeleteBlockers(t *testing.T) {
 					t.Errorf("Unexpected error: %v", err)
 				}
 			}
-
-			cl.Disconnect()
 		})
 	}
 }

xrpl/websocket/connection_test.go

@@ -5,6 +5,11 @@ import (
 	"fmt"
 )
 
+const (
+	// txnNotFound is the error message returned by the xrpl node when requesting for a not found transaction.
+	txnNotFound = "txnNotFound"
+)
+
 var (
 	// transaction
 
@@ -77,11 +82,6 @@ var (
 	// ErrAmountAndDeliverMaxMustBeIdentical is returned when Amount and DeliverMax fields are not identical.
 	ErrAmountAndDeliverMaxMustBeIdentical = errors.New("payment transaction: Amount and DeliverMax fields must be identical when both are provided")
 
-	// tags
-
-	// ErrTagMustEqualAddressTag is returned when a tag must equal the address tag.
-	ErrTagMustEqualAddressTag = errors.New("tag, if present, must be equal to the tag of the address")
-
 	// connection
 
 	// ErrNotConnected is returned when attempting to perform operations on a connection that is not established.