Address review feedback

stellar · Jan 2, 2024 · e8d88da · e8d88da
1 parent c642887
commit e8d88da
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/protocols/stellarcore/tx_response.go b/protocols/stellarcore/tx_response.go
@@ -64,7 +64,7 @@ func DiagnosticEventsToSlice(events string) ([]string, error) {
 		if err != nil {
 			return nil, err
 		}
-		result[0] = encoded
+		result[i] = encoded
 	}
 	return result, nil
 }
diff --git a/protocols/stellarcore/tx_response_test.go b/protocols/stellarcore/tx_response_test.go
@@ -3,12 +3,14 @@ package stellarcore
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestDiagnosticEventsToSlice(t *testing.T) {
-	events := "AAAAAQAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAgAAAA8AAAAFZXJyb3IAAAAAAAACAAAAAwAAAAUAAAAQAAAAAQAAAAMAAAAOAAAAU3RyYW5zYWN0aW9uIGBzb3JvYmFuRGF0YS5yZXNvdXJjZUZlZWAgaXMgbG93ZXIgdGhhbiB0aGUgYWN0dWFsIFNvcm9iYW4gcmVzb3VyY2UgZmVlAAAAAAUAAAAAAAEJcwAAAAUAAAAAAAG6fA=="
+	events := "AAAAAgAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAgAAAA8AAAAFZXJyb3IAAAAAAAACAAAAAwAAAAUAAAAQAAAAAQAAAAMAAAAOAAAAU3RyYW5zYWN0aW9uIGBzb3JvYmFuRGF0YS5yZXNvdXJjZUZlZWAgaXMgbG93ZXIgdGhhbiB0aGUgYWN0dWFsIFNvcm9iYW4gcmVzb3VyY2UgZmVlAAAAAAUAAAAAAAEJcwAAAAUAAAAAAAG6fAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAgAAAA8AAAAFZXJyb3IAAAAAAAACAAAAAwAAAAUAAAAQAAAAAQAAAAMAAAAOAAAAU3RyYW5zYWN0aW9uIGBzb3JvYmFuRGF0YS5yZXNvdXJjZUZlZWAgaXMgbG93ZXIgdGhhbiB0aGUgYWN0dWFsIFNvcm9iYW4gcmVzb3VyY2UgZmVlAAAAAAUAAAAAAAEJcwAAAAUAAAAAAAG6fA=="
 	slice, err := DiagnosticEventsToSlice(events)
-	assert.NoError(t, err)
-	assert.Len(t, slice, 1)
+	require.NoError(t, err)
+	require.Len(t, slice, 2)
+	require.Equal(t, slice[0], "AAAAAAAAAAAAAAAAAAAAAgAAAAAAAAACAAAADwAAAAVlcnJvcgAAAAAAAAIAAAADAAAABQAAABAAAAABAAAAAwAAAA4AAABTdHJhbnNhY3Rpb24gYHNvcm9iYW5EYXRhLnJlc291cmNlRmVlYCBpcyBsb3dlciB0aGFuIHRoZSBhY3R1YWwgU29yb2JhbiByZXNvdXJjZSBmZWUAAAAABQAAAAAAAQlzAAAABQAAAAAAAbp8")
+	require.Equal(t, slice[1], "AAAAAAAAAAAAAAAAAAAAAgAAAAAAAAACAAAADwAAAAVlcnJvcgAAAAAAAAIAAAADAAAABQAAABAAAAABAAAAAwAAAA4AAABTdHJhbnNhY3Rpb24gYHNvcm9iYW5EYXRhLnJlc291cmNlRmVlYCBpcyBsb3dlciB0aGFuIHRoZSBhY3R1YWwgU29yb2JhbiByZXNvdXJjZSBmZWUAAAAABQAAAAAAAQlzAAAABQAAAAAAAbp8")
 }
diff --git a/services/horizon/internal/actions/submit_transaction.go b/services/horizon/internal/actions/submit_transaction.go
@@ -113,8 +113,8 @@ func (handler SubmitTransactionHandler) response(r *http.Request, info envelopeI
 			"result_xdr":   failedErr.ResultXDR,
 			"result_codes": rcr,
 		}
-		if failedErr.DiagnosticEvents != "" {
-			events, err := stellarcore.DiagnosticEventsToSlice(failedErr.DiagnosticEvents)
+		if failedErr.DiagnosticEventsXDR != "" {
+			events, err := stellarcore.DiagnosticEventsToSlice(failedErr.DiagnosticEventsXDR)
 			if err != nil {
 				return nil, err
 			}

diff --git a/services/horizon/internal/actions/submit_transaction_test.go b/services/horizon/internal/actions/submit_transaction_test.go
@@ -212,8 +212,8 @@ func TestSubmissionSorobanDiagnosticEvents(t *testing.T) {
 	mockSubmitter.On("Submit").Return(mockSubmitChannel)
 	mockSubmitChannel <- txsub.Result{
 		Err: &txsub.FailedTransactionError{
-			ResultXDR:        "AAAAAAABCdf////vAAAAAA==",
-			DiagnosticEvents: "AAAAAQAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAgAAAA8AAAAFZXJyb3IAAAAAAAACAAAAAwAAAAUAAAAQAAAAAQAAAAMAAAAOAAAAU3RyYW5zYWN0aW9uIGBzb3JvYmFuRGF0YS5yZXNvdXJjZUZlZWAgaXMgbG93ZXIgdGhhbiB0aGUgYWN0dWFsIFNvcm9iYW4gcmVzb3VyY2UgZmVlAAAAAAUAAAAAAAEJcwAAAAUAAAAAAAG6fA==",
+			ResultXDR:           "AAAAAAABCdf////vAAAAAA==",
+			DiagnosticEventsXDR: "AAAAAQAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAgAAAA8AAAAFZXJyb3IAAAAAAAACAAAAAwAAAAUAAAAQAAAAAQAAAAMAAAAOAAAAU3RyYW5zYWN0aW9uIGBzb3JvYmFuRGF0YS5yZXNvdXJjZUZlZWAgaXMgbG93ZXIgdGhhbiB0aGUgYWN0dWFsIFNvcm9iYW4gcmVzb3VyY2UgZmVlAAAAAAUAAAAAAAEJcwAAAAUAAAAAAAG6fA==",
 		},
 	}
 

diff --git a/services/horizon/internal/txsub/errors.go b/services/horizon/internal/txsub/errors.go
@@ -23,8 +23,9 @@ var (
 // stellar-core rejected the transaction.  ResultXDR is a base64
 // encoded TransactionResult struct
 type FailedTransactionError struct {
-	ResultXDR        string
-	DiagnosticEvents string
+	ResultXDR string
+	// DiagnosticEventsXDR is a base64-encoded []xdr.DiagnosticEvent
+	DiagnosticEventsXDR string
 }
 
 func (err *FailedTransactionError) Error() string {