Merge pull request #764 from onflow/bastian/update-cadence-2

onflow · Oct 21, 2024 · 9286180 · 9286180
2 parents 53bbf91 + 2c4f6f0
commit 9286180
Show file tree

Hide file tree

Showing 28 changed files with 492 additions and 1,307 deletions.
diff --git a/adapters/sdk.go b/adapters/sdk.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/onflow/cadence"
 	jsoncdc "github.com/onflow/cadence/encoding/json"
-	"github.com/onflow/cadence/runtime/stdlib"
+	"github.com/onflow/cadence/stdlib"
 	sdk "github.com/onflow/flow-go-sdk"
 	"github.com/onflow/flow-go-sdk/templates"
 	"github.com/onflow/flow-go/access"

diff --git a/emulator/blockchain.go b/emulator/blockchain.go
@@ -41,9 +41,9 @@ import (
 
 	"github.com/logrusorgru/aurora"
 	"github.com/onflow/cadence"
+	"github.com/onflow/cadence/common"
+	"github.com/onflow/cadence/interpreter"
 	"github.com/onflow/cadence/runtime"
-	"github.com/onflow/cadence/runtime/common"
-	"github.com/onflow/cadence/runtime/interpreter"
 	"github.com/onflow/crypto"
 	"github.com/onflow/crypto/hash"
 	"github.com/onflow/flow-core-contracts/lib/go/templates"

diff --git a/emulator/blockchain_test.go b/emulator/blockchain_test.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/onflow/cadence/runtime/stdlib"
+	"github.com/onflow/cadence/stdlib"
 	"github.com/rs/zerolog"
 
 	"github.com/onflow/flow-emulator/adapters"

diff --git a/emulator/computation_report.go b/emulator/computation_report.go
@@ -19,7 +19,7 @@
 package emulator
 
 import (
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 	"github.com/onflow/flow-go/fvm/environment"
 	"github.com/onflow/flow-go/fvm/meter"
 

diff --git a/emulator/computation_report_test.go b/emulator/computation_report_test.go
@@ -20,10 +20,11 @@ package emulator_test
 
 import (
 	"context"
-	"github.com/onflow/cadence/runtime/common"
+	"testing"
+
+	"github.com/onflow/cadence/common"
 	"github.com/onflow/flow-go/fvm/environment"
 	"github.com/onflow/flow-go/fvm/meter"
-	"testing"
 
 	"github.com/onflow/cadence"
 	flowsdk "github.com/onflow/flow-go-sdk"

diff --git a/emulator/coverage_report_test.go b/emulator/coverage_report_test.go
@@ -23,8 +23,8 @@ import (
 	"testing"
 
 	"github.com/onflow/cadence"
+	"github.com/onflow/cadence/common"
 	"github.com/onflow/cadence/runtime"
-	"github.com/onflow/cadence/runtime/common"
 	flowsdk "github.com/onflow/flow-go-sdk"
 	flowgo "github.com/onflow/flow-go/model/flow"
 	"github.com/rs/zerolog"

diff --git a/emulator/coverage_reported_runtime.go b/emulator/coverage_reported_runtime.go
@@ -20,10 +20,10 @@ package emulator
 
 import (
 	"github.com/onflow/cadence"
+	"github.com/onflow/cadence/common"
+	"github.com/onflow/cadence/interpreter"
 	"github.com/onflow/cadence/runtime"
-	"github.com/onflow/cadence/runtime/common"
-	"github.com/onflow/cadence/runtime/interpreter"
-	"github.com/onflow/cadence/runtime/sema"
+	"github.com/onflow/cadence/sema"
 )
 
 type CoverageReportedRuntime struct {

diff --git a/emulator/emulator.go b/emulator/emulator.go
@@ -21,9 +21,9 @@ package emulator
 import (
 	"fmt"
 
+	"github.com/onflow/cadence/common"
+	"github.com/onflow/cadence/interpreter"
 	"github.com/onflow/cadence/runtime"
-	"github.com/onflow/cadence/runtime/common"
-	"github.com/onflow/cadence/runtime/interpreter"
 	flowgosdk "github.com/onflow/flow-go-sdk"
 	sdkcrypto "github.com/onflow/flow-go-sdk/crypto"
 	"github.com/onflow/flow-go/access"

diff --git a/emulator/events_test.go b/emulator/events_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/onflow/flow-emulator/adapters"
 	"github.com/onflow/flow-emulator/emulator"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 	"github.com/onflow/flow-go-sdk/templates"
 	flowgo "github.com/onflow/flow-go/model/flow"
 	"github.com/stretchr/testify/assert"