Merge pull request #2979 from onflow/bastian/improvements

migrations/account_type/migration.go

@@ -21,6 +21,7 @@ package account_type
 import (
 	"github.com/onflow/cadence/migrations"
 	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/runtime/errors"
 	"github.com/onflow/cadence/runtime/interpreter"
 	"github.com/onflow/cadence/runtime/sema"
 )
@@ -112,11 +113,15 @@ func maybeConvertAccountType(staticType interpreter.StaticType) interpreter.Stat
 
 	case *interpreter.IntersectionStaticType:
 		// No need to convert `staticType.Types` as they can only be interfaces.
-		convertedLegacyType := maybeConvertAccountType(staticType.LegacyType)
-		if convertedLegacyType != nil {
-			intersectionType := interpreter.NewIntersectionStaticType(nil, staticType.Types)
-			intersectionType.LegacyType = convertedLegacyType
-			return intersectionType
+
+		legacyType := staticType.LegacyType
+		if legacyType != nil {
+			convertedLegacyType := maybeConvertAccountType(legacyType)
+			if convertedLegacyType != nil {
+				intersectionType := interpreter.NewIntersectionStaticType(nil, staticType.Types)
+				intersectionType.LegacyType = convertedLegacyType
+				return intersectionType
+			}
 		}
 
 	case *interpreter.OptionalStaticType:
@@ -155,7 +160,7 @@ func maybeConvertAccountType(staticType interpreter.StaticType) interpreter.Stat
 		// Ignore the wrapper, and continue with the inner type.
 		return maybeConvertAccountType(staticType.PrimitiveStaticType)
 
-	default:
+	case interpreter.PrimitiveStaticType:
 		// Is it safe to do so?
 		switch staticType {
 		case interpreter.PrimitiveStaticTypePublicAccount: //nolint:staticcheck
@@ -187,6 +192,9 @@ func maybeConvertAccountType(staticType interpreter.StaticType) interpreter.Stat
 		case interpreter.PrimitiveStaticTypeAccountKey: //nolint:staticcheck
 			return interpreter.AccountKeyStaticType
 		}
+
+	default:
+		panic(errors.NewUnreachableError())
 	}
 
 	return nil

migrations/account_type/migration_test.go

@@ -78,6 +78,9 @@ func TestTypeValueMigration(t *testing.T) {
 	const authAccountType = interpreter.PrimitiveStaticTypeAuthAccount     //nolint:staticcheck
 	const stringType = interpreter.PrimitiveStaticTypeString
 
+	const fooBarQualifiedIdentifier = "Foo.Bar"
+	fooAddressLocation := common.NewAddressLocation(nil, account, "Foo")
+
 	type testCase struct {
 		storedType   interpreter.StaticType
 		expectedType interpreter.StaticType
@@ -137,21 +140,24 @@ func TestTypeValueMigration(t *testing.T) {
 			expectedType: interpreter.NewOptionalStaticType(nil, unauthorizedAccountReferenceType),
 		},
 		"optional_string": {
-			storedType: interpreter.NewOptionalStaticType(nil, stringType),
+			storedType:   interpreter.NewOptionalStaticType(nil, stringType),
+			expectedType: nil,
 		},
 		"constant_sized_account_array": {
 			storedType:   interpreter.NewConstantSizedStaticType(nil, publicAccountType, 3),
 			expectedType: interpreter.NewConstantSizedStaticType(nil, unauthorizedAccountReferenceType, 3),
 		},
 		"constant_sized_string_array": {
-			storedType: interpreter.NewConstantSizedStaticType(nil, stringType, 3),
+			storedType:   interpreter.NewConstantSizedStaticType(nil, stringType, 3),
+			expectedType: nil,
 		},
 		"variable_sized_account_array": {
 			storedType:   interpreter.NewVariableSizedStaticType(nil, authAccountType),
 			expectedType: interpreter.NewVariableSizedStaticType(nil, authAccountReferenceType),
 		},
 		"variable_sized_string_array": {
-			storedType: interpreter.NewVariableSizedStaticType(nil, stringType),
+			storedType:   interpreter.NewVariableSizedStaticType(nil, stringType),
+			expectedType: nil,
 		},
 		"dictionary_with_account_type_value": {
 			storedType: interpreter.NewDictionaryStaticType(
@@ -195,6 +201,7 @@ func TestTypeValueMigration(t *testing.T) {
 				stringType,
 				stringType,
 			),
+			expectedType: nil,
 		},
 		"capability": {
 			storedType: interpreter.NewCapabilityStaticType(
@@ -211,6 +218,7 @@ func TestTypeValueMigration(t *testing.T) {
 				nil,
 				stringType,
 			),
+			expectedType: nil,
 		},
 		"intersection": {
 			storedType: interpreter.NewIntersectionStaticType(
@@ -219,21 +227,23 @@ func TestTypeValueMigration(t *testing.T) {
 					interpreter.NewInterfaceStaticType(
 						nil,
 						nil,
-						"Bar",
+						fooBarQualifiedIdentifier,
 						common.NewTypeIDFromQualifiedName(
 							nil,
-							common.NewAddressLocation(nil, account, "Foo"),
-							"Bar",
+							fooAddressLocation,
+							fooBarQualifiedIdentifier,
 						),
 					),
 				},
 			),
+			expectedType: nil,
 		},
 		"empty intersection": {
 			storedType: interpreter.NewIntersectionStaticType(
 				nil,
 				[]*interpreter.InterfaceStaticType{},
 			),
+			expectedType: nil,
 		},
 		"intersection_with_legacy_type": {
 			storedType: &interpreter.IntersectionStaticType{
@@ -300,25 +310,27 @@ func TestTypeValueMigration(t *testing.T) {
 			storedType: interpreter.NewInterfaceStaticType(
 				nil,
 				nil,
-				"Bar",
+				fooBarQualifiedIdentifier,
 				common.NewTypeIDFromQualifiedName(
 					nil,
-					common.NewAddressLocation(nil, account, "Foo"),
-					"Bar",
+					fooAddressLocation,
+					fooBarQualifiedIdentifier,
 				),
 			),
+			expectedType: nil,
 		},
 		"composite": {
 			storedType: interpreter.NewCompositeStaticType(
 				nil,
 				nil,
-				"Bar",
+				fooBarQualifiedIdentifier,
 				common.NewTypeIDFromQualifiedName(
 					nil,
-					common.NewAddressLocation(nil, account, "Foo"),
-					"Bar",
+					fooAddressLocation,
+					fooBarQualifiedIdentifier,
 				),
 			),
+			expectedType: nil,
 		},
 	}
 
@@ -466,6 +478,9 @@ func TestNestedTypeValueMigration(t *testing.T) {
 	)
 	require.NoError(t, err)
 
+	fooAddressLocation := common.NewAddressLocation(nil, account, "Foo")
+	const fooBarQualifiedIdentifier = "Foo.Bar"
+
 	testCases := map[string]testCase{
 		"account_some_value": {
 			storedValue:   interpreter.NewUnmeteredSomeValueNonCopying(storedAccountTypeValue),
@@ -623,8 +638,8 @@ func TestNestedTypeValueMigration(t *testing.T) {
 			storedValue: interpreter.NewCompositeValue(
 				inter,
 				interpreter.EmptyLocationRange,
-				common.NewAddressLocation(nil, common.Address{0x42}, "Foo"),
-				"Bar",
+				fooAddressLocation,
+				fooBarQualifiedIdentifier,
 				common.CompositeKindResource,
 				[]interpreter.CompositeField{
 					interpreter.NewUnmeteredCompositeField("field1", storedAccountTypeValue),
@@ -635,8 +650,8 @@ func TestNestedTypeValueMigration(t *testing.T) {
 			expectedValue: interpreter.NewCompositeValue(
 				inter,
 				interpreter.EmptyLocationRange,
-				common.NewAddressLocation(nil, common.Address{0x42}, "Foo"),
-				"Bar",
+				fooAddressLocation,
+				fooBarQualifiedIdentifier,
 				common.CompositeKindResource,
 				[]interpreter.CompositeField{
 					interpreter.NewUnmeteredCompositeField("field1", expectedAccountTypeValue),

runtime/interpreter/statictype.go

@@ -1218,10 +1218,10 @@ func NewFunctionStaticType(
 	}
 }
 
-func (t FunctionStaticType) ReturnType(interpreter *Interpreter) StaticType {
+func (t FunctionStaticType) ReturnType(gauge common.MemoryGauge) StaticType {
 	var returnType StaticType
 	if t.Type.ReturnTypeAnnotation.Type != nil {
-		returnType = ConvertSemaToStaticType(interpreter, t.Type.ReturnTypeAnnotation.Type)
+		returnType = ConvertSemaToStaticType(gauge, t.Type.ReturnTypeAnnotation.Type)
 	}
 
 	return returnType

runtime/tests/runtime_utils/testinterface.go

@@ -317,11 +317,17 @@ func (i *TestRuntimeInterface) GetSigningAccounts() ([]runtime.Address, error) {
 }
 
 func (i *TestRuntimeInterface) ProgramLog(message string) error {
+	if i.OnProgramLog == nil {
+		panic("must specify TestRuntimeInterface.OnProgramLog")
+	}
 	i.OnProgramLog(message)
 	return nil
 }
 
 func (i *TestRuntimeInterface) EmitEvent(event cadence.Event) error {
+	if i.OnEmitEvent == nil {
+		panic("must specify TestRuntimeInterface.OnEmitEvent")
+	}
 	return i.OnEmitEvent(event)
 }