swap arguments of New(Unmetered?)HostFunctionValue to put the functio…

…n type before the function block
onflow · Feb 10, 2023 · e9f3ce6 · e9f3ce6
1 parent b64a089
commit e9f3ce6
Show file tree

Hide file tree

Showing 17 changed files with 176 additions and 176 deletions.
diff --git a/runtime/interpreter/deployedcontract.go b/runtime/interpreter/deployedcontract.go
@@ -62,7 +62,7 @@ func newPublicTypesFunctionValue(inter *Interpreter, addressValue AddressValue,
 	var publicTypes *ArrayValue
 
 	address := addressValue.ToAddress()
-	return NewHostFunctionValue(inter, func(inv Invocation) Value {
+	return NewHostFunctionValue(inter, sema.DeployedContractTypePublicTypesFunctionType, func(inv Invocation) Value {
 		if publicTypes == nil {
 			innerInter := inv.Interpreter
 			contractLocation := common.NewAddressLocation(innerInter, address, name.Str)
@@ -97,5 +97,5 @@ func newPublicTypesFunctionValue(inter *Interpreter, addressValue AddressValue,
 		}
 
 		return publicTypes
-	}, sema.DeployedContractTypePublicTypesFunctionType)
+	})
 }
diff --git a/runtime/interpreter/function.go b/runtime/interpreter/function.go
@@ -191,8 +191,8 @@ func (f *HostFunctionValue) MeteredString(memoryGauge common.MemoryGauge, _ Seen
 }
 
 func NewUnmeteredHostFunctionValue(
-	function HostFunction,
 	funcType *sema.FunctionType,
+	function HostFunction,
 ) *HostFunctionValue {
 	// Host functions can be passed by value,
 	// so for the interpreter value transfer check to work,
@@ -209,13 +209,13 @@ func NewUnmeteredHostFunctionValue(
 
 func NewHostFunctionValue(
 	gauge common.MemoryGauge,
-	function HostFunction,
 	funcType *sema.FunctionType,
+	function HostFunction,
 ) *HostFunctionValue {
 
 	common.UseMemory(gauge, common.HostFunctionValueMemoryUsage)
 
-	return NewUnmeteredHostFunctionValue(function, funcType)
+	return NewUnmeteredHostFunctionValue(funcType, function)
 }
 
 var _ Value = &HostFunctionValue{}

diff --git a/runtime/interpreter/function_test.go b/runtime/interpreter/function_test.go
@@ -49,8 +49,8 @@ func TestFunctionStaticType(t *testing.T) {
 
 		hostFunctionValue := NewHostFunctionValue(
 			inter,
-			hostFunction,
 			hostFunctionType,
+			hostFunction,
 		)
 
 		staticType := hostFunctionValue.StaticType(inter)
@@ -73,8 +73,8 @@ func TestFunctionStaticType(t *testing.T) {
 
 		hostFunctionValue := NewHostFunctionValue(
 			inter,
-			hostFunction,
 			hostFunctionType,
+			hostFunction,
 		)
 
 		compositeValue := NewCompositeValue(