Merge destructor removal into stable cadence

runtime/interpreter/value.go

@@ -19315,9 +19315,7 @@ func (NilValue) IsDestroyed() bool {
 	return false
 }
 
-func (v NilValue) Destroy(interpreter *Interpreter, _ LocationRange) {
-
-}
+func (v NilValue) Destroy(_ *Interpreter, _ LocationRange) {}
 
 func (NilValue) String() string {
 	return format.Nil

runtime/resourcedictionary_test.go

@@ -984,8 +984,7 @@ func TestRuntimeResourceDictionaryValues_Destruction(t *testing.T) {
 	require.Equal(t, events[2].EventType.ID(), "A.0000000000000001.Test.R.ResourceDestroyed")
 	// one of the two needs to be 1, the other needs to be 2
 	require.True(t,
-		(events[1].Fields[0].String() == "1" && events[2].Fields[0].String() == "2") ||
-			(events[2].Fields[0].String() == "1" && events[1].Fields[0].String() == "2"),
+		(events[2].Fields[0].String() == "1" && events[1].Fields[0].String() == "2"),
 	)
 }
 

runtime/sema/check_composite_declaration.go

@@ -848,7 +848,10 @@ func (checker *Checker) declareCompositeLikeMembersAndValue(
 				checker.Elaboration.SetDefaultDestroyDeclaration(declaration, nestedCompositeDeclaration)
 				defaultEventType :=
 					checker.typeActivations.Find(identifier.Identifier)
-				defaultEventComposite := defaultEventType.Type.(*CompositeType)
+				defaultEventComposite, ok := defaultEventType.Type.(*CompositeType)
+				if !ok {
+					panic(errors.NewUnreachableError())
+				}
 				compositeType.DefaultDestroyEvent = defaultEventComposite
 			}
 
@@ -2006,8 +2009,11 @@ func (checker *Checker) checkDefaultDestroyParamExpressionKind(
 		*ast.IntegerExpression,
 		*ast.FixedPointExpression,
 		*ast.PathExpression:
+
 		break
+
 	case *ast.IdentifierExpression:
+
 		identifier := arg.Identifier.Identifier
 		// these are guaranteed to exist at time of destruction, so we allow them
 		if identifier == SelfIdentifier || identifier == BaseIdentifier {
@@ -2020,9 +2026,13 @@ func (checker *Checker) checkDefaultDestroyParamExpressionKind(
 		checker.report(&DefaultDestroyInvalidArgumentError{
 			Range: ast.NewRangeFromPositioned(checker.memoryGauge, arg),
 		})
+
 	case *ast.MemberExpression:
+
 		checker.checkDefaultDestroyParamExpressionKind(arg.Expression)
+
 	case *ast.IndexExpression:
+
 		checker.checkDefaultDestroyParamExpressionKind(arg.TargetExpression)
 		checker.checkDefaultDestroyParamExpressionKind(arg.IndexingExpression)
 
@@ -2048,9 +2058,11 @@ func (checker *Checker) checkDefaultDestroyParamExpressionKind(
 		})
 
 	default:
+
 		checker.report(&DefaultDestroyInvalidArgumentError{
 			Range: ast.NewRangeFromPositioned(checker.memoryGauge, arg),
 		})
+
 	}
 }
 

runtime/sema/check_interface_declaration.go

@@ -449,7 +449,10 @@ func (checker *Checker) declareInterfaceMembersAndValue(declaration *ast.Interfa
 					// Find the value declaration
 					nestedEvent :=
 						checker.typeActivations.Find(nestedCompositeDeclaration.Identifier.Identifier)
-					defaultEventComposite := nestedEvent.Type.(*CompositeType)
+					defaultEventComposite, ok := nestedEvent.Type.(*CompositeType)
+					if !ok {
+						panic(errors.NewUnreachableError())
+					}
 					interfaceType.DefaultDestroyEvent = defaultEventComposite
 				} else {
 					checker.declareNestedEvent(nestedCompositeDeclaration, eventMembers, interfaceType)

runtime/tests/interpreter/interpreter_test.go

@@ -6594,7 +6594,7 @@ func TestInterpretResourceMoveInArrayAndDestroy(t *testing.T) {
       }
     `, ParseCheckAndInterpretOptions{
 		Config: &interpreter.Config{
-			OnEventEmitted: func(inter *interpreter.Interpreter, locationRange interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
+			OnEventEmitted: func(_ *interpreter.Interpreter, _ interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
 				events = append(events, event)
 				return nil
 			},
@@ -6643,7 +6643,7 @@ func TestInterpretResourceMoveInDictionaryAndDestroy(t *testing.T) {
       }
     `, ParseCheckAndInterpretOptions{
 		Config: &interpreter.Config{
-			OnEventEmitted: func(inter *interpreter.Interpreter, locationRange interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
+			OnEventEmitted: func(_ *interpreter.Interpreter, _ interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
 				events = append(events, event)
 				return nil
 			},
@@ -6905,7 +6905,7 @@ func TestInterpretResourceDestroyExpressionDestructor(t *testing.T) {
        }
     `, ParseCheckAndInterpretOptions{
 		Config: &interpreter.Config{
-			OnEventEmitted: func(inter *interpreter.Interpreter, locationRange interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
+			OnEventEmitted: func(_ *interpreter.Interpreter, _ interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
 				events = append(events, event)
 				return nil
 			},
@@ -6954,7 +6954,7 @@ func TestInterpretResourceDestroyExpressionNestedResources(t *testing.T) {
       }
     `, ParseCheckAndInterpretOptions{
 		Config: &interpreter.Config{
-			OnEventEmitted: func(inter *interpreter.Interpreter, locationRange interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
+			OnEventEmitted: func(_ *interpreter.Interpreter, _ interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
 				events = append(events, event)
 				return nil
 			},
@@ -6989,7 +6989,7 @@ func TestInterpretResourceDestroyArray(t *testing.T) {
       }
     `, ParseCheckAndInterpretOptions{
 		Config: &interpreter.Config{
-			OnEventEmitted: func(inter *interpreter.Interpreter, locationRange interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
+			OnEventEmitted: func(_ *interpreter.Interpreter, _ interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
 				events = append(events, event)
 				return nil
 			},
@@ -7022,7 +7022,7 @@ func TestInterpretResourceDestroyDictionary(t *testing.T) {
       }
     `, ParseCheckAndInterpretOptions{
 		Config: &interpreter.Config{
-			OnEventEmitted: func(inter *interpreter.Interpreter, locationRange interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
+			OnEventEmitted: func(_ *interpreter.Interpreter, _ interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
 				events = append(events, event)
 				return nil
 			},
@@ -7055,7 +7055,7 @@ func TestInterpretResourceDestroyOptionalSome(t *testing.T) {
       }
     `, ParseCheckAndInterpretOptions{
 		Config: &interpreter.Config{
-			OnEventEmitted: func(inter *interpreter.Interpreter, locationRange interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
+			OnEventEmitted: func(_ *interpreter.Interpreter, _ interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
 				events = append(events, event)
 				return nil
 			},
@@ -7087,7 +7087,7 @@ func TestInterpretResourceDestroyOptionalNil(t *testing.T) {
       }
     `, ParseCheckAndInterpretOptions{
 		Config: &interpreter.Config{
-			OnEventEmitted: func(inter *interpreter.Interpreter, locationRange interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
+			OnEventEmitted: func(_ *interpreter.Interpreter, _ interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
 				events = append(events, event)
 				return nil
 			},
@@ -9571,7 +9571,7 @@ func TestInterpretNestedDestroy(t *testing.T) {
           }
         `, ParseCheckAndInterpretOptions{
 		Config: &interpreter.Config{
-			OnEventEmitted: func(inter *interpreter.Interpreter, locationRange interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
+			OnEventEmitted: func(_ *interpreter.Interpreter, _ interpreter.LocationRange, event *interpreter.CompositeValue, eventType *sema.CompositeType) error {
 				events = append(events, event)
 				return nil
 			},
@@ -11724,17 +11724,12 @@ func TestInterpretSwapDictionaryKeysWithSideEffects(t *testing.T) {
 	t.Run("resources", func(t *testing.T) {
 		t.Parallel()
 
-		inter, _, err := parseCheckAndInterpretWithLogs(t, `
+		inter, getEvents, err := parseCheckAndInterpretWithEvents(t, `
           resource Resource {
+			  event ResourceDestroyed(value: Int = self.value)
               var value: Int
 
               init(_ value: Int) {
-                  log(
-                      "Creating resource with UUID "
-                          .concat(self.uuid.toString())
-                          .concat(" and value ")
-                          .concat(value.toString())
-                  )
                   self.value = value
               }
           }
@@ -11781,6 +11776,13 @@ func TestInterpretSwapDictionaryKeysWithSideEffects(t *testing.T) {
 		_, err = inter.Invoke("test")
 		require.NoError(t, err)
 
-		// DestructorTODO: replace with test for destruction event
+		events := getEvents()
+		require.Len(t, events, 3)
+		require.Equal(t, events[0].event.QualifiedIdentifier, "Resource.ResourceDestroyed")
+		require.Equal(t, events[0].event.GetField(inter, interpreter.EmptyLocationRange, "value"), interpreter.NewIntValueFromInt64(nil, 2))
+		require.Equal(t, events[1].event.QualifiedIdentifier, "Resource.ResourceDestroyed")
+		require.Equal(t, events[1].event.GetField(inter, interpreter.EmptyLocationRange, "value"), interpreter.NewIntValueFromInt64(nil, 1))
+		require.Equal(t, events[2].event.QualifiedIdentifier, "Resource.ResourceDestroyed")
+		require.Equal(t, events[2].event.GetField(inter, interpreter.EmptyLocationRange, "value"), interpreter.NewIntValueFromInt64(nil, 3))
 	})
 }