Merge pull request #8003 from onflow/bastian/clean-up-test-runtime

[FVM] Clean up test runtime

Author: turbolent

fvm/environment/system_contracts_test.go

@@ -61,7 +61,7 @@ func TestSystemContractsInvoke(t *testing.T) {
 				0,
 				runtime.Config{},
 				func(_ runtime.Config) runtime.Runtime {
-					return &testutil.TestInterpreterRuntime{
+					return &testutil.TestRuntime{
 						InvokeContractFunc: tc.contractFunction,
 					}
 				},

fvm/executionParameters_test.go

@@ -32,7 +32,7 @@ func TestGetExecutionMemoryWeights(t *testing.T) {
 		envMock := &fvmmock.Environment{}
 		envMock.On("BorrowCadenceRuntime", mock.Anything).Return(
 			reusableRuntime.NewReusableCadenceRuntime(
-				&testutil.TestInterpreterRuntime{
+				&testutil.TestRuntime{
 					ReadStoredFunc: readStored,
 				},
 				runtime.Config{},
@@ -162,7 +162,7 @@ func TestGetExecutionEffortWeights(t *testing.T) {
 		envMock := &fvmmock.Environment{}
 		envMock.On("BorrowCadenceRuntime", mock.Anything).Return(
 			reusableRuntime.NewReusableCadenceRuntime(
-				&testutil.TestInterpreterRuntime{
+				&testutil.TestRuntime{
 					ReadStoredFunc: readStored,
 				},
 				runtime.Config{},

fvm/runtime/testutil/runtime.go

@@ -8,83 +8,85 @@ import (
 	"github.com/onflow/cadence/sema"
 )
 
-var _ runtime.Runtime = &TestInterpreterRuntime{}
-
-type TestInterpreterRuntime struct {
-	ReadStoredFunc     func(address common.Address, path cadence.Path, context runtime.Context) (cadence.Value, error)
-	InvokeContractFunc func(a common.AddressLocation, s string, values []cadence.Value, types []sema.Type, ctx runtime.Context) (cadence.Value, error)
-}
-
-func (t *TestInterpreterRuntime) Config() runtime.Config {
+var _ runtime.Runtime = &TestRuntime{}
+
+type TestRuntime struct {
+	ReadStoredFunc func(
+		address common.Address,
+		path cadence.Path,
+		context runtime.Context,
+	) (cadence.Value, error)
+	InvokeContractFunc func(
+		a common.AddressLocation,
+		s string,
+		values []cadence.Value,
+		types []sema.Type,
+		ctx runtime.Context,
+	) (cadence.Value, error)
+}
+
+func (t *TestRuntime) Config() runtime.Config {
 	panic("Config not defined")
 }
 
-func (t *TestInterpreterRuntime) NewScriptExecutor(script runtime.Script, context runtime.Context) runtime.Executor {
+func (t *TestRuntime) NewScriptExecutor(_ runtime.Script, _ runtime.Context) runtime.Executor {
 	panic("NewScriptExecutor not defined")
 }
 
-func (t *TestInterpreterRuntime) NewTransactionExecutor(script runtime.Script, context runtime.Context) runtime.Executor {
+func (t *TestRuntime) NewTransactionExecutor(_ runtime.Script, _ runtime.Context) runtime.Executor {
 	panic("NewTransactionExecutor not defined")
 }
 
-func (t *TestInterpreterRuntime) NewContractFunctionExecutor(contractLocation common.AddressLocation, functionName string, arguments []cadence.Value, argumentTypes []sema.Type, context runtime.Context) runtime.Executor {
+func (t *TestRuntime) NewContractFunctionExecutor(
+	_ common.AddressLocation,
+	_ string,
+	_ []cadence.Value,
+	_ []sema.Type,
+	_ runtime.Context,
+) runtime.Executor {
 	panic("NewContractFunctionExecutor not defined")
 }
 
-func (t *TestInterpreterRuntime) SetDebugger(debugger *interpreter.Debugger) {
+func (t *TestRuntime) SetDebugger(_ *interpreter.Debugger) {
 	panic("SetDebugger not defined")
 }
 
-func (t *TestInterpreterRuntime) ExecuteScript(runtime.Script, runtime.Context) (cadence.Value, error) {
+func (t *TestRuntime) ExecuteScript(_ runtime.Script, _ runtime.Context) (cadence.Value, error) {
 	panic("ExecuteScript not defined")
 }
 
-func (t *TestInterpreterRuntime) ExecuteTransaction(runtime.Script, runtime.Context) error {
+func (t *TestRuntime) ExecuteTransaction(_ runtime.Script, _ runtime.Context) error {
 	panic("ExecuteTransaction not defined")
 }
 
-func (t *TestInterpreterRuntime) InvokeContractFunction(a common.AddressLocation, s string, values []cadence.Value, types []sema.Type, ctx runtime.Context) (cadence.Value, error) {
+func (t *TestRuntime) InvokeContractFunction(
+	a common.AddressLocation,
+	s string,
+	values []cadence.Value,
+	types []sema.Type,
+	ctx runtime.Context,
+) (cadence.Value, error) {
 	if t.InvokeContractFunc == nil {
 		panic("InvokeContractFunction not defined")
 	}
 	return t.InvokeContractFunc(a, s, values, types, ctx)
 }
 
-func (t *TestInterpreterRuntime) ParseAndCheckProgram([]byte, runtime.Context) (*interpreter.Program, error) {
+func (t *TestRuntime) ParseAndCheckProgram(_ []byte, _ runtime.Context) (*interpreter.Program, error) {
 	panic("ParseAndCheckProgram not defined")
 }
 
-func (t *TestInterpreterRuntime) SetCoverageReport(*runtime.CoverageReport) {
-	panic("SetCoverageReport not defined")
-}
-
-func (t *TestInterpreterRuntime) SetContractUpdateValidationEnabled(bool) {
-	panic("SetContractUpdateValidationEnabled not defined")
-}
-
-func (t *TestInterpreterRuntime) SetAtreeValidationEnabled(bool) {
-	panic("SetAtreeValidationEnabled not defined")
-}
-
-func (t *TestInterpreterRuntime) SetTracingEnabled(bool) {
-	panic("SetTracingEnabled not defined")
-}
-
-func (t *TestInterpreterRuntime) SetInvalidatedResourceValidationEnabled(bool) {
-	panic("SetInvalidatedResourceValidationEnabled not defined")
-}
-
-func (t *TestInterpreterRuntime) SetResourceOwnerChangeHandlerEnabled(bool) {
-	panic("SetResourceOwnerChangeHandlerEnabled not defined")
-}
-
-func (t *TestInterpreterRuntime) ReadStored(address common.Address, path cadence.Path, context runtime.Context) (cadence.Value, error) {
+func (t *TestRuntime) ReadStored(
+	address common.Address,
+	path cadence.Path,
+	context runtime.Context,
+) (cadence.Value, error) {
 	if t.ReadStoredFunc == nil {
 		panic("ReadStored not defined")
 	}
 	return t.ReadStoredFunc(address, path, context)
 }
 
-func (*TestInterpreterRuntime) Storage(runtime.Context) (*runtime.Storage, *interpreter.Interpreter, error) {
-	panic("not implemented")
+func (*TestRuntime) Storage(_ runtime.Context) (*runtime.Storage, *interpreter.Interpreter, error) {
+	panic("Storage not defined")
 }