Skip to content

Commit 3b97ba4

Browse files
turbolentturbolent
committed
adjust test runner to API changes of dependencies
1 parent 0fbba01 commit 3b97ba4

File tree

2 files changed

+23
-20
lines changed

2 files changed

+23
-20
lines changed

‎test/test_framework_test.go

+17-13
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"testing"
2727
"time"
2828

29+
. "github.com/onflow/cadence/test_utils/sema_utils"
2930
"github.com/rs/zerolog"
3031
"github.com/stretchr/testify/assert"
3132
"github.com/stretchr/testify/require"
@@ -35,7 +36,6 @@ import (
3536
"github.com/onflow/cadence/runtime"
3637
"github.com/onflow/cadence/sema"
3738
"github.com/onflow/cadence/stdlib"
38-
"github.com/onflow/cadence/tests/checker"
3939
)
4040

4141
var firstAccountAddress = common.Address{0, 0, 0, 0, 0, 0, 0, 6}
@@ -476,7 +476,7 @@ func TestImportContract(t *testing.T) {
476476
_, err := runner.RunTest(code, "test")
477477
require.Error(t, err)
478478

479-
errs := checker.RequireCheckerErrors(t, err, 2)
479+
errs := RequireCheckerErrors(t, err, 2)
480480

481481
importedProgramError := &sema.ImportedProgramError{}
482482
assert.ErrorAs(t, errs[0], &importedProgramError)
@@ -501,7 +501,7 @@ func TestImportContract(t *testing.T) {
501501
_, err := runner.RunTest(code, "test")
502502
require.Error(t, err)
503503

504-
errs := checker.RequireCheckerErrors(t, err, 2)
504+
errs := RequireCheckerErrors(t, err, 2)
505505

506506
importedProgramError := &sema.ImportedProgramError{}
507507
require.ErrorAs(t, errs[0], &importedProgramError)
@@ -2608,6 +2608,8 @@ func TestInterpretFailFunction(t *testing.T) {
26082608
t.Parallel()
26092609

26102610
t.Run("without message", func(t *testing.T) {
2611+
t.Parallel()
2612+
26112613
const script = `
26122614
import Test
26132615
@@ -2624,6 +2626,8 @@ func TestInterpretFailFunction(t *testing.T) {
26242626
})
26252627

26262628
t.Run("with message", func(t *testing.T) {
2629+
t.Parallel()
2630+
26272631
const script = `
26282632
import Test
26292633
@@ -2765,7 +2769,7 @@ func TestInterpretMatcher(t *testing.T) {
27652769
runner := NewTestRunner()
27662770
_, err := runner.RunTest(script, "test")
27672771
require.Error(t, err)
2768-
errs := checker.RequireCheckerErrors(t, err, 1)
2772+
errs := RequireCheckerErrors(t, err, 1)
27692773
assert.IsType(t, &sema.TypeMismatchError{}, errs[0])
27702774
})
27712775

@@ -2807,7 +2811,7 @@ func TestInterpretMatcher(t *testing.T) {
28072811
_, err := runner.RunTest(script, "test")
28082812
require.Error(t, err)
28092813

2810-
errs := checker.RequireCheckerErrors(t, err, 1)
2814+
errs := RequireCheckerErrors(t, err, 1)
28112815

28122816
assert.IsType(t, &sema.TypeMismatchError{}, errs[0])
28132817
})
@@ -2904,7 +2908,7 @@ func TestInterpretEqualMatcher(t *testing.T) {
29042908
_, err := runner.RunTest(script, "test")
29052909
require.Error(t, err)
29062910

2907-
errs := checker.RequireCheckerErrors(t, err, 2)
2911+
errs := RequireCheckerErrors(t, err, 2)
29082912
assert.IsType(t, &sema.TypeMismatchError{}, errs[0])
29092913
assert.IsType(t, &sema.TypeMismatchError{}, errs[1])
29102914
})
@@ -2941,7 +2945,7 @@ func TestInterpretEqualMatcher(t *testing.T) {
29412945
_, err := runner.RunTest(script, "test")
29422946
require.Error(t, err)
29432947

2944-
errs := checker.RequireCheckerErrors(t, err, 1)
2948+
errs := RequireCheckerErrors(t, err, 1)
29452949

29462950
assert.IsType(t, &sema.TypeMismatchError{}, errs[0])
29472951
})
@@ -3065,7 +3069,7 @@ func TestInterpretEqualMatcher(t *testing.T) {
30653069
_, err := runner.RunTest(script, "test")
30663070
require.Error(t, err)
30673071

3068-
errs := checker.RequireCheckerErrors(t, err, 4)
3072+
errs := RequireCheckerErrors(t, err, 4)
30693073
assert.IsType(t, &sema.TypeMismatchError{}, errs[0])
30703074
assert.IsType(t, &sema.TypeMismatchError{}, errs[1])
30713075
assert.IsType(t, &sema.TypeMismatchError{}, errs[2])
@@ -3098,7 +3102,7 @@ func TestInterpretEqualMatcher(t *testing.T) {
30983102
_, err := runner.RunTest(script, "test")
30993103
require.Error(t, err)
31003104

3101-
errs := checker.RequireCheckerErrors(t, err, 3)
3105+
errs := RequireCheckerErrors(t, err, 3)
31023106
assert.IsType(t, &sema.TypeMismatchError{}, errs[0])
31033107
assert.IsType(t, &sema.TypeMismatchError{}, errs[1])
31043108
assert.IsType(t, &sema.TypeMismatchError{}, errs[2])
@@ -3194,7 +3198,7 @@ func TestInterpretExpectFunction(t *testing.T) {
31943198
_, err := runner.RunTest(script, "test")
31953199
require.Error(t, err)
31963200

3197-
errs := checker.RequireCheckerErrors(t, err, 1)
3201+
errs := RequireCheckerErrors(t, err, 1)
31983202

31993203
assert.IsType(t, &sema.TypeMismatchError{}, errs[0])
32003204
})
@@ -3218,7 +3222,7 @@ func TestInterpretExpectFunction(t *testing.T) {
32183222
_, err := runner.RunTest(script, "test")
32193223
require.Error(t, err)
32203224

3221-
errs := checker.RequireCheckerErrors(t, err, 2)
3225+
errs := RequireCheckerErrors(t, err, 2)
32223226
assert.IsType(t, &sema.TypeMismatchError{}, errs[0])
32233227
assert.IsType(t, &sema.TypeMismatchError{}, errs[1])
32243228
})
@@ -3243,7 +3247,7 @@ func TestInterpretExpectFunction(t *testing.T) {
32433247
_, err := runner.RunTest(script, "test")
32443248
require.Error(t, err)
32453249

3246-
errs := checker.RequireCheckerErrors(t, err, 1)
3250+
errs := RequireCheckerErrors(t, err, 1)
32473251
assert.IsType(t, &sema.TypeMismatchError{}, errs[0])
32483252
})
32493253

@@ -3267,7 +3271,7 @@ func TestInterpretExpectFunction(t *testing.T) {
32673271
_, err := runner.RunTest(script, "test")
32683272
require.Error(t, err)
32693273

3270-
errs := checker.RequireCheckerErrors(t, err, 1)
3274+
errs := RequireCheckerErrors(t, err, 1)
32713275
assert.IsType(t, &sema.TypeMismatchError{}, errs[0])
32723276
})
32733277
}

‎test/test_runner.go

+6-7
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
"github.com/onflow/cadence/stdlib"
3636
"github.com/onflow/flow-go/fvm/environment"
3737
"github.com/onflow/flow-go/fvm/evm"
38-
"github.com/onflow/flow-go/fvm/evm/debug"
3938
"github.com/onflow/flow-go/model/flow"
4039
"github.com/rs/zerolog"
4140

@@ -451,8 +450,7 @@ func (r *TestRunner) initializeEnvironment() (
451450
runtime.Context,
452451
) {
453452
config := runtime.Config{
454-
AttachmentsEnabled: true,
455-
CoverageReport: r.coverageReport,
453+
CoverageReport: r.coverageReport,
456454
}
457455

458456
env := runtime.NewBaseInterpreterEnvironment(config)
@@ -502,7 +500,7 @@ func (r *TestRunner) initializeEnvironment() (
502500
env.Configure(
503501
ctx.Interface,
504502
runtime.NewCodesAndPrograms(),
505-
runtime.NewStorage(ctx.Interface, nil),
503+
runtime.NewStorage(ctx.Interface, nil, runtime.StorageConfig{}),
506504
r.coverageReport,
507505
)
508506

@@ -607,10 +605,12 @@ func (r *TestRunner) interpreterContractValueHandler(
607605
blockchainStorage := runtime.NewStorage(
608606
r.backend.blockchain.NewScriptEnvironment(),
609607
inter,
608+
runtime.StorageConfig{},
610609
)
611-
storageMap := blockchainStorage.GetStorageMap(
610+
storageMap := blockchainStorage.GetDomainStorageMap(
611+
inter,
612612
location.Address,
613-
runtime.StorageDomainContract,
613+
common.StorageDomainContract,
614614
false,
615615
)
616616
if storageMap != nil {
@@ -794,7 +794,6 @@ func setupEVMEnvironment(
794794
chain.ChainID(),
795795
fvmEnv,
796796
runtimeEnv,
797-
debug.NopTracer,
798797
)
799798
}
800799

0 commit comments

Comments
 (0)