fix imports

onflow · Oct 30, 2024 · 951b6f9 · 951b6f9
1 parent d65f54d
commit 951b6f9
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 34 deletions.
diff --git a/fvm/evm/stdlib/contract_test.go b/fvm/evm/stdlib/contract_test.go
@@ -14,8 +14,8 @@ import (
 	"github.com/onflow/cadence/runtime"
 	"github.com/onflow/cadence/sema"
 	cadenceStdlib "github.com/onflow/cadence/stdlib"
-	. "github.com/onflow/cadence/tests/runtime_utils"
-	"github.com/onflow/cadence/tests/utils"
+	. "github.com/onflow/cadence/test_utils/common_utils"
+	. "github.com/onflow/cadence/test_utils/runtime_utils"
 	coreContracts "github.com/onflow/flow-core-contracts/lib/go/contracts"
 	coreContractstemplates "github.com/onflow/flow-core-contracts/lib/go/templates"
 	"github.com/onflow/go-ethereum/crypto"
@@ -2413,7 +2413,7 @@ func TestEVMEncodeDecodeABIErrors(t *testing.T) {
 				Location:    nextScriptLocation(),
 			},
 		)
-		utils.RequireError(t, err)
+		RequireError(t, err)
 		assert.ErrorContains(
 			t,
 			err,
@@ -2498,7 +2498,7 @@ func TestEVMEncodeDecodeABIErrors(t *testing.T) {
 				Location:    nextScriptLocation(),
 			},
 		)
-		utils.RequireError(t, err)
+		RequireError(t, err)
 		assert.ErrorContains(
 			t,
 			err,
@@ -2584,7 +2584,7 @@ func TestEVMEncodeDecodeABIErrors(t *testing.T) {
 				Location:    nextScriptLocation(),
 			},
 		)
-		utils.RequireError(t, err)
+		RequireError(t, err)
 		assert.ErrorContains(
 			t,
 			err,
@@ -2670,7 +2670,7 @@ func TestEVMEncodeDecodeABIErrors(t *testing.T) {
 				Location:    nextScriptLocation(),
 			},
 		)
-		utils.RequireError(t, err)
+		RequireError(t, err)
 		assert.ErrorContains(
 			t,
 			err,
@@ -2766,7 +2766,7 @@ func TestEVMEncodeDecodeABIErrors(t *testing.T) {
 				Location:    nextScriptLocation(),
 			},
 		)
-		utils.RequireError(t, err)
+		RequireError(t, err)
 		assert.ErrorContains(
 			t,
 			err,
@@ -2852,7 +2852,7 @@ func TestEVMEncodeDecodeABIErrors(t *testing.T) {
 				Location:    nextScriptLocation(),
 			},
 		)
-		utils.RequireError(t, err)
+		RequireError(t, err)
 		assert.ErrorContains(
 			t,
 			err,
@@ -2938,7 +2938,7 @@ func TestEVMEncodeDecodeABIErrors(t *testing.T) {
 				Location:    nextScriptLocation(),
 			},
 		)
-		utils.RequireError(t, err)
+		RequireError(t, err)
 		assert.ErrorContains(
 			t,
 			err,
@@ -3024,7 +3024,7 @@ func TestEVMEncodeDecodeABIErrors(t *testing.T) {
 				Location:    nextScriptLocation(),
 			},
 		)
-		utils.RequireError(t, err)
+		RequireError(t, err)
 		assert.ErrorContains(
 			t,
 			err,
@@ -3110,7 +3110,7 @@ func TestEVMEncodeDecodeABIErrors(t *testing.T) {
 				Location:    nextScriptLocation(),
 			},
 		)
-		utils.RequireError(t, err)
+		RequireError(t, err)
 		assert.ErrorContains(
 			t,
 			err,
@@ -3196,7 +3196,7 @@ func TestEVMEncodeDecodeABIErrors(t *testing.T) {
 				Location:    nextScriptLocation(),
 			},
 		)
-		utils.RequireError(t, err)
+		RequireError(t, err)
 		assert.ErrorContains(
 			t,
 			err,
@@ -3292,7 +3292,7 @@ func TestEVMEncodeDecodeABIErrors(t *testing.T) {
 				Location:    nextScriptLocation(),
 			},
 		)
-		utils.RequireError(t, err)
+		RequireError(t, err)
 		assert.ErrorContains(
 			t,
 			err,

diff --git a/fvm/fvm_test.go b/fvm/fvm_test.go
@@ -10,22 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/rs/zerolog"
-
 	"github.com/coreos/go-semver/semver"
-	"github.com/onflow/flow-core-contracts/lib/go/templates"
-
-	"github.com/onflow/flow-go/fvm/storage"
-	"github.com/onflow/flow-go/fvm/storage/state"
-
-	cadenceStdlib "github.com/onflow/cadence/stdlib"
-
-	flowsdk "github.com/onflow/flow-go-sdk"
-	"github.com/onflow/flow-go-sdk/test"
-
-	envMock "github.com/onflow/flow-go/fvm/environment/mock"
-	"github.com/onflow/flow-go/fvm/evm/events"
-
 	"github.com/onflow/cadence"
 	"github.com/onflow/cadence/common"
 	"github.com/onflow/cadence/encoding/ccf"
@@ -34,8 +19,13 @@ import (
 	"github.com/onflow/cadence/interpreter"
 	"github.com/onflow/cadence/runtime"
 	"github.com/onflow/cadence/sema"
-	"github.com/onflow/cadence/tests/utils"
+	cadenceStdlib "github.com/onflow/cadence/stdlib"
+	"github.com/onflow/cadence/test_utils/runtime_utils"
 	"github.com/onflow/crypto"
+	"github.com/onflow/flow-core-contracts/lib/go/templates"
+	flowsdk "github.com/onflow/flow-go-sdk"
+	"github.com/onflow/flow-go-sdk/test"
+	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/assert"
 	mockery "github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
@@ -45,13 +35,17 @@ import (
 	"github.com/onflow/flow-go/fvm"
 	fvmCrypto "github.com/onflow/flow-go/fvm/crypto"
 	"github.com/onflow/flow-go/fvm/environment"
+	envMock "github.com/onflow/flow-go/fvm/environment/mock"
 	"github.com/onflow/flow-go/fvm/errors"
+	"github.com/onflow/flow-go/fvm/evm/events"
 	"github.com/onflow/flow-go/fvm/evm/stdlib"
 	"github.com/onflow/flow-go/fvm/evm/types"
 	"github.com/onflow/flow-go/fvm/meter"
 	reusableRuntime "github.com/onflow/flow-go/fvm/runtime"
+	"github.com/onflow/flow-go/fvm/storage"
 	"github.com/onflow/flow-go/fvm/storage/snapshot"
 	"github.com/onflow/flow-go/fvm/storage/snapshot/mock"
+	"github.com/onflow/flow-go/fvm/storage/state"
 	"github.com/onflow/flow-go/fvm/storage/testutils"
 	"github.com/onflow/flow-go/fvm/systemcontracts"
 	"github.com/onflow/flow-go/fvm/tracing"
@@ -2612,25 +2606,25 @@ func TestStorageIterationWithBrokenValues(t *testing.T) {
 				}
 
 				// Deploy `A`
-				runTransaction(utils.DeploymentTransaction(
+				runTransaction(runtime_utils.DeploymentTransaction(
 					"A",
 					[]byte(contractA),
 				))
 
 				// Deploy `B`
-				runTransaction(utils.DeploymentTransaction(
+				runTransaction(runtime_utils.DeploymentTransaction(
 					"B",
 					[]byte(contractB),
 				))
 
 				// Deploy `C`
-				runTransaction(utils.DeploymentTransaction(
+				runTransaction(runtime_utils.DeploymentTransaction(
 					"C",
 					[]byte(contractC),
 				))
 
 				// Deploy `D`
-				runTransaction(utils.DeploymentTransaction(
+				runTransaction(runtime_utils.DeploymentTransaction(
 					"D",
 					[]byte(contractD),
 				))
@@ -2672,7 +2666,7 @@ func TestStorageIterationWithBrokenValues(t *testing.T) {
 				)))
 
 				// Update `A`, such that `B`, `C` and `D` are now broken.
-				runTransaction(utils.UpdateTransaction(
+				runTransaction(runtime_utils.UpdateTransaction(
 					"A",
 					[]byte(updatedContractA),
 				))