refactor: return nil intended amount for non native

Author: GrePod

internal/xrp/client.go

@@ -185,11 +185,10 @@ func (c *xrpClient) GetBlockResult(ctx context.Context, blockNum uint64) (*index
 		// case-insensitive check for transaction type
 		if strings.EqualFold(tx.TransactionType, paymentType) {
 			transactions[i].PaymentReference = tx.paymentReference()
-			isNative, err := tx.isNativePayment()
+			transactions[i].IsNativePayment, err = tx.isNativePayment()
 			if err != nil {
-				return nil, fmt.Errorf("isNativePayment: %w", err)
+				return nil, fmt.Errorf("isNativePayment for tx %s: %w", tx.Hash, err)
 			}
-			transactions[i].IsNativePayment = isNative
 
 			transactions[i].IntendedReceivingAmount, err = tx.intendedReceivingAmount()
 			if err != nil {

internal/xrp/transaction.go

@@ -130,11 +130,10 @@ func (tx *transaction) transactionStatus() (bool, error) {
 }
 
 // intendedReceivingAmount returns the native XRP amount in drops that the
-// sender intended to deliver. Returns a pointer to 0 for non-native (token) payments.
+// sender intended to deliver. Returns nil for non-native (token) payments.
 func (tx *transaction) intendedReceivingAmount() (*uint64, error) {
 	if len(tx.Amount) == 0 || tx.Amount[0] != '"' {
-		zero := uint64(0)
-		return &zero, nil
+		return nil, nil
 	}
 
 	var s string

internal/xrp/transaction_test.go

@@ -64,12 +64,12 @@ func TestIntendedReceivingAmount(t *testing.T) {
 		{
 			name:     "token amount object",
 			amount:   `{"currency":"USD","issuer":"rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn","value":"100"}`,
-			expected: uint64Ptr(0),
+			expected: nil,
 		},
 		{
 			name:     "empty amount",
 			amount:   ``,
-			expected: uint64Ptr(0),
+			expected: nil,
 		},
 	}
 
@@ -253,6 +253,7 @@ func TestSourceAddressesRoot(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			tx := transaction{MetaData: json.RawMessage(tt.metaData)}
 			result, err := tx.sourceAddressesRoot()
+
 			require.NoError(t, err)
 			require.Equal(t, tt.expected, result)
 		})