Use ComputationKindLoop for internal array-value iterations

onflow · Oct 20, 2023 · c9ef8e3 · c9ef8e3
1 parent c16b00f
commit c9ef8e3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/runtime/common/computationkind.go b/runtime/common/computationkind.go
@@ -57,7 +57,7 @@ const (
 	ComputationKindCreateArrayValue
 	ComputationKindTransferArrayValue
 	ComputationKindDestroyArrayValue
-	ComputationKindIterateArrayValue
+	_
 	_
 	_
 	_

diff --git a/runtime/common/computationkind_string.go b/runtime/common/computationkind_string.go
diff --git a/runtime/interpreter/value.go b/runtime/interpreter/value.go
@@ -2997,7 +2997,7 @@ func (v *ArrayValue) Reverse(
 			}
 
 			// Meter computation for iterating the array.
-			interpreter.ReportComputation(common.ComputationKindIterateArrayValue, 1)
+			interpreter.ReportComputation(common.ComputationKindLoop, 1)
 
 			value := v.Get(interpreter, locationRange, index)
 			index--
@@ -3050,7 +3050,7 @@ func (v *ArrayValue) Filter(
 
 			for {
 				// Meter computation for iterating the array.
-				interpreter.ReportComputation(common.ComputationKindIterateArrayValue, 1)
+				interpreter.ReportComputation(common.ComputationKindLoop, 1)
 
 				atreeValue, err := iterator.Next()
 				if err != nil {
@@ -3146,7 +3146,7 @@ func (v *ArrayValue) Map(
 		func() Value {
 
 			// Meter computation for iterating the array.
-			interpreter.ReportComputation(common.ComputationKindIterateArrayValue, 1)
+			interpreter.ReportComputation(common.ComputationKindLoop, 1)
 
 			atreeValue, err := iterator.Next()
 			if err != nil {

diff --git a/runtime/interpreter/value_string.go b/runtime/interpreter/value_string.go
@@ -134,7 +134,7 @@ func stringFunctionJoin(invocation Invocation) Value {
 	stringArray.Iterate(inter, func(element Value) (resume bool) {
 
 		// Meter computation for iterating the array.
-		inter.ReportComputation(common.ComputationKindIterateArrayValue, 1)
+		inter.ReportComputation(common.ComputationKindLoop, 1)
 
 		// Add separator
 		if !first {

diff --git a/runtime/tests/interpreter/metering_test.go b/runtime/tests/interpreter/metering_test.go
@@ -424,7 +424,7 @@ func TestInterpretArrayFunctionsComputationMetering(t *testing.T) {
 		_, err = inter.Invoke("main")
 		require.NoError(t, err)
 
-		assert.Equal(t, uint(3), computationMeteredValues[common.ComputationKindIterateArrayValue])
+		assert.Equal(t, uint(3), computationMeteredValues[common.ComputationKindLoop])
 	})
 
 	t.Run("map", func(t *testing.T) {
@@ -452,7 +452,7 @@ func TestInterpretArrayFunctionsComputationMetering(t *testing.T) {
 		_, err = inter.Invoke("main")
 		require.NoError(t, err)
 
-		assert.Equal(t, uint(5), computationMeteredValues[common.ComputationKindIterateArrayValue])
+		assert.Equal(t, uint(5), computationMeteredValues[common.ComputationKindLoop])
 	})
 
 	t.Run("filter", func(t *testing.T) {
@@ -480,7 +480,7 @@ func TestInterpretArrayFunctionsComputationMetering(t *testing.T) {
 		_, err = inter.Invoke("main")
 		require.NoError(t, err)
 
-		assert.Equal(t, uint(6), computationMeteredValues[common.ComputationKindIterateArrayValue])
+		assert.Equal(t, uint(6), computationMeteredValues[common.ComputationKindLoop])
 	})
 }
 
@@ -509,6 +509,6 @@ func TestInterpretStdlibComputationMetering(t *testing.T) {
 		_, err = inter.Invoke("main")
 		require.NoError(t, err)
 
-		assert.Equal(t, uint(4), computationMeteredValues[common.ComputationKindIterateArrayValue])
+		assert.Equal(t, uint(4), computationMeteredValues[common.ComputationKindLoop])
 	})
 }