Fixing tests

stellar · Dec 1, 2022 · 3c30fc9 · 3c30fc9
1 parent 7dc95ce
commit 3c30fc9
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 18 deletions.
diff --git a/cmd/soroban-rpc/internal/test/get_contract_data_test.go b/cmd/soroban-rpc/internal/test/get_contract_data_test.go
@@ -140,7 +140,7 @@ func TestGetContractDataSucceeds(t *testing.T) {
 	installContractCodeArgs, err := xdr.InstallContractCodeArgs{Code: testContract}.MarshalBinary()
 	assert.NoError(t, err)
 	contractHash := sha256.Sum256(installContractCodeArgs)
-	assert.Equal(t, contractHash, scVal.MustObj().MustContractCode().MustWasmId())
+	assert.Equal(t, xdr.Hash(contractHash), scVal.MustObj().MustContractCode().MustWasmId())
 }
 
 func assertSendTransaction(t *testing.T, client *jrpc2.Client, kp *keypair.Full, txnParams txnbuild.TransactionParams) {

diff --git a/cmd/soroban-rpc/internal/test/get_ledger_entry_test.go b/cmd/soroban-rpc/internal/test/get_ledger_entry_test.go
@@ -103,7 +103,7 @@ func TestGetLedgerEntrySucceeds(t *testing.T) {
 		SourceAccount:        &account,
 		IncrementSequenceNum: true,
 		Operations: []txnbuild.Operation{
-			createInvokeHostOperation(t, account.AccountID, true),
+			createInstallContractCodeOperation(t, account.AccountID, testContract, true),
 		},
 		BaseFee: txnbuild.MinBaseFee,
 		Preconditions: txnbuild.Preconditions{

diff --git a/cmd/soroban-rpc/internal/test/simulate_transaction_test.go b/cmd/soroban-rpc/internal/test/simulate_transaction_test.go
@@ -24,8 +24,32 @@ var (
 )
 
 // createInvokeHostOperation creates a dummy InvokeHostFunctionOp. In this case by installing a contract code.
-func createInvokeHostOperation(t *testing.T, sourceAccount string, includeFootprint bool) *txnbuild.InvokeHostFunction {
-	return createInstallContractCodeOperation(t, sourceAccount, testContract, includeFootprint)
+func createInvokeHostOperation(t *testing.T, sourceAccount string, footprint xdr.LedgerFootprint, contractId xdr.Hash, method string, args ...xdr.ScVal) *txnbuild.InvokeHostFunction {
+	var contractIdBytes []byte = contractId[:]
+	contractIdObj := &xdr.ScObject{
+		Type: xdr.ScObjectTypeScoBytes,
+		Bin:  &contractIdBytes,
+	}
+	methodSymbol := xdr.ScSymbol(method)
+	parameters := xdr.ScVec{
+		xdr.ScVal{
+			Type: xdr.ScValTypeScvObject,
+			Obj:  &contractIdObj,
+		},
+		xdr.ScVal{
+			Type: xdr.ScValTypeScvSymbol,
+			Sym:  &methodSymbol,
+		},
+	}
+	parameters = append(parameters, args...)
+	return &txnbuild.InvokeHostFunction{
+		Footprint: footprint,
+		Function: xdr.HostFunction{
+			Type:       xdr.HostFunctionTypeHostFunctionTypeInvokeContract,
+			InvokeArgs: &parameters,
+		},
+		SourceAccount: sourceAccount,
+	}
 }
 
 func createInstallContractCodeOperation(t *testing.T, sourceAccount string, contractCode []byte, includeFootprint bool) *txnbuild.InvokeHostFunction {
@@ -149,7 +173,7 @@ func TestSimulateTransactionSucceeds(t *testing.T) {
 		},
 		IncrementSequenceNum: false,
 		Operations: []txnbuild.Operation{
-			createInvokeHostOperation(t, sourceAccount, false),
+			createInstallContractCodeOperation(t, sourceAccount, testContract, false),
 		},
 		BaseFee: txnbuild.MinBaseFee,
 		Memo:    nil,
@@ -171,21 +195,21 @@ func TestSimulateTransactionSucceeds(t *testing.T) {
 	assert.Equal(
 		t,
 		methods.SimulateTransactionResponse{
-			Footprint: "AAAAAAAAAAEAAAAGkvS4fCJA01o8HRusdDVaD5Z7F2lkyM3UfhQOjETmlDMAAAADAAAAAw==",
+			Footprint: "AAAAAAAAAAEAAAAH6p/Lga5Uop9rO/KThH0/1+mjaf0cgKyv7Gq9VxMX4MI=",
 			Cost: methods.SimulateTransactionCost{
 				CPUInstructions: result.Cost.CPUInstructions,
 				MemoryBytes:     result.Cost.MemoryBytes,
 			},
 			Results: []methods.InvokeHostFunctionResult{
-				{XDR: "AAAABAAAAAEAAAAEAAAAIJL0uHwiQNNaPB0brHQ1Wg+WexdpZMjN1H4UDoxE5pQz"},
+				{XDR: "AAAABAAAAAEAAAAGAAAAIOqfy4GuVKKfazvyk4R9P9fpo2n9HICsr+xqvVcTF+DC"},
 			},
 			LatestLedger: result.LatestLedger,
 		},
 		result,
 	)
 
 	// test operation which does not have a source account
-	withoutSourceAccountOp := createInvokeHostOperation(t, "", false)
+	withoutSourceAccountOp := createInstallContractCodeOperation(t, "", testContract, false)
 	tx, err = txnbuild.NewTransaction(txnbuild.TransactionParams{
 		SourceAccount: &txnbuild.SimpleAccount{
 			AccountID: sourceAccount,
@@ -216,9 +240,11 @@ func TestSimulateTransactionSucceeds(t *testing.T) {
 			Sequence:  0,
 		},
 		IncrementSequenceNum: false,
-		Operations:           []txnbuild.Operation{createInvokeHostOperation(t, sourceAccount, false)},
-		BaseFee:              txnbuild.MinBaseFee,
-		Memo:                 nil,
+		Operations: []txnbuild.Operation{
+			createInstallContractCodeOperation(t, sourceAccount, testContract, false),
+		},
+		BaseFee: txnbuild.MinBaseFee,
+		Memo:    nil,
 		Preconditions: txnbuild.Preconditions{
 			TimeBounds: txnbuild.NewInfiniteTimeout(),
 		},
@@ -244,8 +270,7 @@ func TestSimulateTransactionError(t *testing.T) {
 	client := jrpc2.NewClient(ch, nil)
 
 	sourceAccount := keypair.Root(StandaloneNetworkPassphrase).Address()
-	invokeHostOp := createInvokeHostOperation(t, sourceAccount, false)
-	invokeHostOp.Function.InstallContractCodeArgs = nil
+	invokeHostOp := createInvokeHostOperation(t, sourceAccount, xdr.LedgerFootprint{}, xdr.Hash{}, "noMethod")
 	tx, err := txnbuild.NewTransaction(txnbuild.TransactionParams{
 		SourceAccount: &txnbuild.SimpleAccount{
 			AccountID: keypair.Root(StandaloneNetworkPassphrase).Address(),
@@ -383,9 +408,11 @@ func TestSimulateTransactionDeadlineError(t *testing.T) {
 			Sequence:  0,
 		},
 		IncrementSequenceNum: false,
-		Operations:           []txnbuild.Operation{createInvokeHostOperation(t, sourceAccount, false)},
-		BaseFee:              txnbuild.MinBaseFee,
-		Memo:                 nil,
+		Operations: []txnbuild.Operation{
+			createInstallContractCodeOperation(t, sourceAccount, testContract, false),
+		},
+		BaseFee: txnbuild.MinBaseFee,
+		Memo:    nil,
 		Preconditions: txnbuild.Preconditions{
 			TimeBounds: txnbuild.NewInfiniteTimeout(),
 		},

diff --git a/cmd/soroban-rpc/internal/test/transaction_test.go b/cmd/soroban-rpc/internal/test/transaction_test.go
@@ -83,7 +83,7 @@ func TestSendTransactionSucceedsWithResults(t *testing.T) {
 		SourceAccount:        &account,
 		IncrementSequenceNum: true,
 		Operations: []txnbuild.Operation{
-			createInvokeHostOperation(t, account.AccountID, true),
+			createInstallContractCodeOperation(t, account.AccountID, testContract, true),
 		},
 		BaseFee: txnbuild.MinBaseFee,
 		Preconditions: txnbuild.Preconditions{
@@ -220,7 +220,7 @@ func TestSendTransactionFailedInLedger(t *testing.T) {
 		IncrementSequenceNum: true,
 		Operations: []txnbuild.Operation{
 			// without the footprint the tx will fail
-			createInvokeHostOperation(t, account.AccountID, false),
+			createInstallContractCodeOperation(t, account.AccountID, testContract, false),
 		},
 		BaseFee: txnbuild.MinBaseFee,
 		Preconditions: txnbuild.Preconditions{