From 4c4757dff02bfc7acea1ba6787509c4795f9d408 Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Thu, 15 Dec 2022 11:34:41 +0000 Subject: [PATCH 1/2] Use a real scval in the test to make it more legible --- .../internal/test/transaction_test.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/cmd/soroban-rpc/internal/test/transaction_test.go b/cmd/soroban-rpc/internal/test/transaction_test.go index f7c31d604..53e00387c 100644 --- a/cmd/soroban-rpc/internal/test/transaction_test.go +++ b/cmd/soroban-rpc/internal/test/transaction_test.go @@ -2,6 +2,7 @@ package test import ( "context" + "encoding/hex" "testing" "time" @@ -11,6 +12,7 @@ import ( "github.com/stellar/go/keypair" "github.com/stellar/go/txnbuild" + "github.com/stellar/go/xdr" "github.com/stellar/soroban-tools/cmd/soroban-rpc/internal/methods" ) @@ -113,12 +115,15 @@ func TestSendTransactionSucceedsWithResults(t *testing.T) { assert.Equal(t, methods.TransactionSuccess, response.Status) assert.Equal(t, expectedHash, response.ID) assert.Nil(t, response.Error) - assert.Equal(t, - []methods.SCVal{ - {XDR: "AAAABAAAAAEAAAAGAAAAIOqfy4GuVKKfazvyk4R9P9fpo2n9HICsr+xqvVcTF+DC"}, - }, - response.Results, - ) + + // Check the result is what we expect + assert.Equal(t, 1, len(response.Results)) + var resultVal xdr.ScVal + assert.NoError(t, xdr.SafeUnmarshalBase64(response.Results[0].XDR, &resultVal)) + expectedContractId, err := hex.DecodeString("ea9fcb81ae54a29f6b3bf293847d3fd7e9a369fd1c80acafec6abd571317e0c2") + assert.NoError(t, err) + expectedObj := &xdr.ScObject{Type: xdr.ScObjectTypeScoBytes, Bin: &expectedContractId} + assert.Equal(t, xdr.ScVal{Type: xdr.ScValTypeScvObject, Obj: &expectedObj}, resultVal) accountInfoRequest := methods.AccountRequest{ Address: address, From 31437e122b5bb274518422c32ec88ae2555435bf Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Thu, 15 Dec 2022 11:36:21 +0000 Subject: [PATCH 2/2] use .Equals --- cmd/soroban-rpc/internal/test/transaction_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/soroban-rpc/internal/test/transaction_test.go b/cmd/soroban-rpc/internal/test/transaction_test.go index 53e00387c..b58ec4447 100644 --- a/cmd/soroban-rpc/internal/test/transaction_test.go +++ b/cmd/soroban-rpc/internal/test/transaction_test.go @@ -123,7 +123,7 @@ func TestSendTransactionSucceedsWithResults(t *testing.T) { expectedContractId, err := hex.DecodeString("ea9fcb81ae54a29f6b3bf293847d3fd7e9a369fd1c80acafec6abd571317e0c2") assert.NoError(t, err) expectedObj := &xdr.ScObject{Type: xdr.ScObjectTypeScoBytes, Bin: &expectedContractId} - assert.Equal(t, xdr.ScVal{Type: xdr.ScValTypeScvObject, Obj: &expectedObj}, resultVal) + assert.True(t, xdr.ScVal{Type: xdr.ScValTypeScvObject, Obj: &expectedObj}.Equals(resultVal)) accountInfoRequest := methods.AccountRequest{ Address: address,