Merge pull request #348 from onflow/auto-update-onflow-cadence-v0.35.0

Author: turbolent

access/grpc/convert_test.go

@@ -202,6 +202,10 @@ func TestConvert_Event(t *testing.T) {
 	eventB, err := messageToEvent(msg, nil)
 	require.NoError(t, err)
 
+	// Force evaluation of type ID, which is cached in type.
+	// Necessary for equality check below
+	_ = eventB.Value.Type().ID()
+
 	assert.Equal(t, eventA, eventB)
 }
 
@@ -264,5 +268,11 @@ func TestConvert_TransactionResult(t *testing.T) {
 	resultB, err := messageToTransactionResult(msg, nil)
 	require.NoError(t, err)
 
+	// Force evaluation of type ID, which is cached in type.
+	// Necessary for equality check below
+	for _, event := range resultB.Events {
+		_ = event.Value.Type().ID()
+	}
+
 	assert.Equal(t, resultA, resultB)
 }

access/grpc/grpc_test.go

@@ -420,6 +420,12 @@ func TestClient_GetTransactionResult(t *testing.T) {
 		result, err := c.GetTransactionResult(ctx, txID)
 		require.NoError(t, err)
 
+		// Force evaluation of type ID, which is cached in type.
+		// Necessary for equality check below
+		for _, event := range result.Events {
+			_ = event.Value.Type().ID()
+		}
+
 		assert.Equal(t, expectedResult, *result)
 
 	}))
@@ -456,6 +462,14 @@ func TestClient_GetTransactionResultsByBlockID(t *testing.T) {
 		results, err := c.GetTransactionResultsByBlockID(ctx, blockID)
 		require.NoError(t, err)
 
+		// Force evaluation of type ID, which is cached in type.
+		// Necessary for equality check below
+		for _, result := range results {
+			for _, event := range result.Events {
+				_ = event.Value.Type().ID()
+			}
+		}
+
 		assert.Equal(t, len(results), 1)
 		assert.Equal(t, expectedResult, *results[0])
 	}))
@@ -763,6 +777,14 @@ func TestClient_GetEventsForHeightRange(t *testing.T) {
 			})
 			require.NoError(t, err)
 
+			// Force evaluation of type ID, which is cached in type.
+			// Necessary for equality check below
+			for _, block := range blocks {
+				for _, event := range block.Events {
+					_ = event.Value.Type().ID()
+				}
+			}
+
 			assert.Len(t, blocks, len(response.Results))
 
 			assert.Equal(t, response.Results[0].BlockId, blocks[0].BlockID.Bytes())
@@ -855,6 +877,14 @@ func TestClient_GetEventsForBlockIDs(t *testing.T) {
 			blocks, err := c.GetEventsForBlockIDs(ctx, "foo", []flow.Identifier{blockIDA, blockIDB})
 			require.NoError(t, err)
 
+			// Force evaluation of type ID, which is cached in type.
+			// Necessary for equality checks below
+			for _, block := range blocks {
+				for _, event := range block.Events {
+					_ = event.Value.Type().ID()
+				}
+			}
+
 			assert.Len(t, blocks, len(response.Results))
 
 			assert.Equal(t, response.Results[0].BlockId, blocks[0].BlockID.Bytes())

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/config v1.18.10
 	github.com/aws/aws-sdk-go-v2/service/kms v1.20.1
 	github.com/ethereum/go-ethereum v1.9.13
-	github.com/onflow/cadence v0.31.3
+	github.com/onflow/cadence v0.35.0
 	github.com/onflow/flow-go/crypto v0.24.4
 	github.com/onflow/flow/protobuf/go/flow v0.3.1
 	github.com/onflow/sdks v0.5.0

go.sum

@@ -314,8 +314,8 @@ github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXW
 github.com/olekukonko/tablewriter v0.0.2-0.20190409134802-7e037d187b0c/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/onflow/atree v0.4.0 h1:+TbNisavAkukAKhgQ4plWnvR9o5+SkwPIsi3jaeAqKs=
 github.com/onflow/atree v0.4.0/go.mod h1:7Qe1xaW0YewvouLXrugzMFUYXNoRQ8MT/UsVAWx1Ndo=
-github.com/onflow/cadence v0.31.3 h1:lTHTBnoFi/ahGk1cQ9JAC+tfYir4kjRVIqtTVCjbe6E=
-github.com/onflow/cadence v0.31.3/go.mod h1:oRgWkvau1RH15m3NuDlZCPHFQzwvC72jEstCGu8OJ98=
+github.com/onflow/cadence v0.35.0 h1:MWq1phGfU8CjYm3UO0z/2xTKMpb9Z/vHH0RZdqIpyIE=
+github.com/onflow/cadence v0.35.0/go.mod h1:hhktaaXlJmxnfLgH2HG0cftcUWScdfjO/CTZkzaom/g=
 github.com/onflow/flow-go/crypto v0.24.4 h1:SwEtoVS2TidCIHYCZMgQ7U2YsqhI9upnw94fhdHTubM=
 github.com/onflow/flow-go/crypto v0.24.4/go.mod h1:dkVL98P6GHR48iD9zCB6XlnkJX8IQd00FKgt1reV90w=
 github.com/onflow/flow/protobuf/go/flow v0.3.1 h1:4I8ykG6naR3n8Or6eXrZDaGVaoztb3gP2KJ6XKyDufg=