make interface condition deduplication feature flag version-based, add runtime tests

Author: turbolent

interpreter/interface_test.go

@@ -1111,7 +1111,7 @@ func TestInterpretInterfaceFunctionConditionsInheritance(t *testing.T) {
 
 		t.Parallel()
 
-		testWithConditionsDeduplication := func(conditionsDeduplicationEnabled bool) []string {
+		testWithConditionsDeduplication := func(t *testing.T, conditionsDeduplicationEnabled bool) []string {
 
 			var logs []string
 
@@ -1164,7 +1164,7 @@ func TestInterpretInterfaceFunctionConditionsInheritance(t *testing.T) {
             struct Test: Foo {
             }
 
-            access(all) view fun printMessage(_ msg: String): Bool {
+            view fun printMessage(_ msg: String): Bool {
                 log(msg)
                 return true
             }
@@ -1202,29 +1202,29 @@ func TestInterpretInterfaceFunctionConditionsInheritance(t *testing.T) {
 		t.Run("enabled", func(t *testing.T) {
 			t.Parallel()
 
-			logs := testWithConditionsDeduplication(true)
+			logs := testWithConditionsDeduplication(t, true)
 			require.Equal(
 				t,
 				[]string{
-					"\"invoked Foo.test() pre-condition\"",
-					"\"invoked Foo.test()\"",
-					"\"invoked Foo.test() post-condition\"",
+					`"invoked Foo.test() pre-condition"`,
+					`"invoked Foo.test()"`,
+					`"invoked Foo.test() post-condition"`,
 				}, logs,
 			)
 		})
 
 		t.Run("disabled", func(t *testing.T) {
 			t.Parallel()
 
-			logs := testWithConditionsDeduplication(false)
+			logs := testWithConditionsDeduplication(t, false)
 			require.Equal(
 				t,
 				[]string{
-					"\"invoked Foo.test() pre-condition\"",
-					"\"invoked Foo.test() pre-condition\"",
-					"\"invoked Foo.test()\"",
-					"\"invoked Foo.test() post-condition\"",
-					"\"invoked Foo.test() post-condition\"",
+					`"invoked Foo.test() pre-condition"`,
+					`"invoked Foo.test() pre-condition"`,
+					`"invoked Foo.test()"`,
+					`"invoked Foo.test() post-condition"`,
+					`"invoked Foo.test() post-condition"`,
 				}, logs,
 			)
 		})

runtime/config.go

@@ -39,7 +39,4 @@ type Config struct {
 	LegacyContractUpgradeEnabled bool
 	// StorageFormatV2Enabled specifies whether storage format V2 is enabled
 	StorageFormatV2Enabled bool
-	// FunctionConditionsDeduplicationEnabled determines whether to skip running function conditions explicitly
-	// if they are already included as part of the inherited default function.
-	FunctionConditionsDeduplicationEnabled bool
 }

runtime/environment.go

@@ -199,7 +199,6 @@ func (e *interpreterEnvironment) newInterpreterConfig() *interpreter.Config {
 		LegacyContractUpgradeEnabled:              e.config.LegacyContractUpgradeEnabled,
 		ValidateAccountCapabilitiesGetHandler:     e.newValidateAccountCapabilitiesGetHandler(),
 		ValidateAccountCapabilitiesPublishHandler: e.newValidateAccountCapabilitiesPublishHandler(),
-		FunctionConditionsDeduplicationEnabled:    e.config.FunctionConditionsDeduplicationEnabled,
 	}
 }
 
@@ -1447,4 +1446,5 @@ func (e *interpreterEnvironment) configureVersionedFeatures() {
 	fixesEnabled := semver.Compare(minimumRequiredVersion, FixesEnabledVersion) >= 0
 	e.InterpreterConfig.ExportFixesEnabled = fixesEnabled
 	e.InterpreterConfig.FunctionScopingFixEnabled = fixesEnabled
+	e.InterpreterConfig.FunctionConditionsDeduplicationEnabled = fixesEnabled
 }

runtime/runtime_test.go

@@ -12392,3 +12392,93 @@ func TestRuntimeClosureScopingInnerFunction(t *testing.T) {
 		require.Equal(t, cadence.NewInt(2), actual)
 	})
 }
+
+func TestRuntimeInterfaceConditionDeduplication(t *testing.T) {
+	t.Parallel()
+
+	testWithConditionsDeduplication := func(t *testing.T, conditionsDeduplicationEnabled bool) []string {
+
+		script := `
+				access(all) event Log(message: String)
+
+                access(all) struct interface Foo {
+
+                    access(all) fun test() {
+                        pre {
+                             emit Log(message: "invoked Foo.test() pre-condition")
+                        }
+                        post {
+                             emit Log(message: "invoked Foo.test() post-condition")
+                        }
+                        emit Log(message: "invoked Foo.test()")
+                    }
+                }
+
+                access(all) struct Test: Foo {
+                }
+
+                access(all) fun main() {
+                   Test().test()
+                }
+            `
+
+		rt := NewTestInterpreterRuntime()
+
+		var events []string
+
+		_, err := rt.ExecuteScript(
+			Script{
+				Source: []byte(script),
+			},
+			Context{
+				Interface: &TestRuntimeInterface{
+					OnMinimumRequiredVersion: func() (string, error) {
+						if conditionsDeduplicationEnabled {
+							return FixesEnabledVersion, nil
+						} else {
+							return "v0.0.0", nil
+						}
+					},
+					OnEmitEvent: func(event cadence.Event) error {
+						events = append(events, event.FieldsMappedByName()["message"].String())
+						return nil
+					},
+				},
+				Location: common.ScriptLocation{},
+			},
+		)
+		require.NoError(t, err)
+
+		return events
+	}
+
+	t.Run("enabled", func(t *testing.T) {
+		t.Parallel()
+
+		logs := testWithConditionsDeduplication(t, true)
+		require.Equal(
+			t,
+			[]string{
+				`"invoked Foo.test() pre-condition"`,
+				`"invoked Foo.test()"`,
+				`"invoked Foo.test() post-condition"`,
+			}, logs,
+		)
+	})
+
+	t.Run("disabled", func(t *testing.T) {
+		t.Parallel()
+
+		logs := testWithConditionsDeduplication(t, false)
+		require.Equal(
+			t,
+			[]string{
+				`"invoked Foo.test() pre-condition"`,
+				`"invoked Foo.test() pre-condition"`,
+				`"invoked Foo.test()"`,
+				`"invoked Foo.test() post-condition"`,
+				`"invoked Foo.test() post-condition"`,
+			}, logs,
+		)
+	})
+}