Move subdirectories under runtime to top level

.github/workflows/benchmark.yml

@@ -48,15 +48,15 @@ jobs:
 
       - name: Run benchmark on current branch
         run: |
-          ( for i in {1..${{ steps.settings.outputs.benchmark_repetitions }}}; do go test ./... -run=XXX -bench=. -benchmem -shuffle=on; done | sed 's/pkg:.*/pkg: github.com\/onflow\/cadence\/runtime/' ) | tee new.txt
+          ( for i in {1..${{ steps.settings.outputs.benchmark_repetitions }}}; do go test ./... -run=XXX -bench=. -benchmem -shuffle=on; done | sed 's/pkg:.*/pkg: github.com\/onflow\/cadence\/' ) | tee new.txt
       # the package replace line above is to make the results table more readable, since it is not fragmented by package
 
       - name: Checkout base branch
         run: git checkout ${{ github.event.pull_request.base.sha }}
 
       - name: Run benchmark on base branch
         run: |
-          ( for i in {1..${{ steps.settings.outputs.benchmark_repetitions }}}; do go test ./... -run=XXX -bench=. -benchmem -shuffle=on; done | sed 's/pkg:.*/pkg: github.com\/onflow\/cadence\/runtime/' ) | tee old.txt
+          ( for i in {1..${{ steps.settings.outputs.benchmark_repetitions }}}; do go test ./... -run=XXX -bench=. -benchmem -shuffle=on; done | sed 's/pkg:.*/pkg: github.com\/onflow\/cadence\/' ) | tee old.txt
 
       # see https://trstringer.com/github-actions-multiline-strings/ to see why this part is complex
       - name: Use benchstat for comparison

.github/workflows/ci.yml

@@ -49,7 +49,7 @@ jobs:
         run: make ci
 
       - name: Cadence Testing Framework
-        run: cd runtime/stdlib/contracts && flow test --cover --covercode="contracts" crypto_test.cdc
+        run: cd stdlib/contracts && flow test --cover --covercode="contracts" crypto_test.cdc
 
       - name: Upload coverage report
         uses: codecov/codecov-action@v2

.gitignore

@@ -34,10 +34,10 @@ suppressions
 
 coverage.txt
 coverage.txt-e
-runtime/cmd/check/check
-runtime/cmd/main/main
-runtime/cmd/parse/parse
-runtime/cmd/parse/parse.wasm
+cmd/check/check
+cmd/main/main
+cmd/parse/parse
+cmd/parse/parse.wasm
 tools/golangci-lint/golangci-lint
 tools/maprange/maprange
 tools/unkeyed/unkeyed

Makefile

@@ -21,7 +21,7 @@ GOPATH ?= $(HOME)/go
 # Ensure go bin path is in path (Especially for CI)
 PATH := $(PATH):$(GOPATH)/bin
 
-COVERPKGS := $(shell go list ./... | grep -v /cmd | grep -v /runtime/test | tr "\n" "," | sed 's/,*$$//')
+COVERPKGS := $(shell go list ./... | grep -v /cmd | grep -v /test | tr "\n" "," | sed 's/,*$$//')
 
 
 LINTERS :=
@@ -30,19 +30,19 @@ ifneq ($(linters),)
 endif
 
 .PHONY: build
-build: build-tools ./runtime/cmd/parse/parse ./runtime/cmd/parse/parse.wasm ./runtime/cmd/check/check ./runtime/cmd/main/main
+build: build-tools ./cmd/parse/parse ./cmd/parse/parse.wasm ./cmd/check/check ./cmd/main/main
 
-./runtime/cmd/parse/parse:
-	go build -o $@ ./runtime/cmd/parse
+./cmd/parse/parse:
+	go build -o $@ ./cmd/parse
 
-./runtime/cmd/parse/parse.wasm:
-	GOARCH=wasm GOOS=js go build -o $@ ./runtime/cmd/parse
+./cmd/parse/parse.wasm:
+	GOARCH=wasm GOOS=js go build -o $@ ./cmd/parse
 
-./runtime/cmd/check/check:
-	go build -o $@ ./runtime/cmd/check
+./cmd/check/check:
+	go build -o $@ ./cmd/check
 
-./runtime/cmd/main/main:
-	go build -o $@ ./runtime/cmd/main
+./cmd/main/main:
+	go build -o $@ ./cmd/main
 
 .PHONY: build-tools
 build-tools: build-analysis build-get-contracts
@@ -60,7 +60,7 @@ ci:
 	# test all packages
 	go test -coverprofile=coverage.txt -covermode=atomic -parallel 8 -race -coverpkg $(COVERPKGS) ./...
 	# run interpreter smoke tests. results from run above are reused, so no tests runs are duplicated
-	go test -count=5 ./runtime/tests/interpreter/... -runSmokeTests=true -validateAtree=false
+	go test -count=5 ./tests/interpreter/... -runSmokeTests=true -validateAtree=false
 	# remove coverage of empty functions from report
 	sed -i -e 's/^.* 0 0$$//' coverage.txt
 

runtime/activations/activations.go → activations/activations.go

@@ -19,7 +19,7 @@
 package activations
 
 import (
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 // Activation is a map of strings to values.

runtime/ast/access.go → ast/access.go

@@ -22,8 +22,8 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/onflow/cadence/runtime/common"
-	"github.com/onflow/cadence/runtime/errors"
+	"github.com/onflow/cadence/common"
+	"github.com/onflow/cadence/errors"
 )
 
 //go:generate go run golang.org/x/tools/cmd/stringer -type=PrimitiveAccess

runtime/ast/argument.go → ast/argument.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 type Argument struct {

runtime/ast/attachment.go → ast/attachment.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 // AttachmentDeclaration

runtime/ast/block.go → ast/block.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 type Block struct {

runtime/ast/composite.go → ast/composite.go

@@ -23,8 +23,8 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
-	"github.com/onflow/cadence/runtime/errors"
+	"github.com/onflow/cadence/common"
+	"github.com/onflow/cadence/errors"
 )
 
 // ConformingDeclaration

runtime/ast/composite_test.go → ast/composite_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 func TestFieldDeclaration_MarshalJSON(t *testing.T) {

runtime/ast/conditionkind.go → ast/conditionkind.go

@@ -21,7 +21,7 @@ package ast
 import (
 	"encoding/json"
 
-	"github.com/onflow/cadence/runtime/errors"
+	"github.com/onflow/cadence/errors"
 )
 
 //go:generate go run golang.org/x/tools/cmd/stringer -type=ConditionKind

runtime/ast/declaration.go → ast/declaration.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 type Declaration interface {

runtime/ast/entitlement_declaration.go → ast/entitlement_declaration.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 // EntitlementDeclaration

runtime/ast/expression.go → ast/expression.go

@@ -26,9 +26,9 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/errors"
+	"github.com/onflow/cadence/errors"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 const NilConstant = "nil"

runtime/ast/expression_extractor.go → ast/expression_extractor.go

@@ -21,8 +21,8 @@ package ast
 import (
 	"fmt"
 
-	"github.com/onflow/cadence/runtime/common"
-	"github.com/onflow/cadence/runtime/errors"
+	"github.com/onflow/cadence/common"
+	"github.com/onflow/cadence/errors"
 )
 
 type VoidExtractor interface {

runtime/ast/function_declaration.go → ast/function_declaration.go

@@ -23,8 +23,8 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
-	"github.com/onflow/cadence/runtime/errors"
+	"github.com/onflow/cadence/common"
+	"github.com/onflow/cadence/errors"
 )
 
 type FunctionPurity int

runtime/ast/function_declaration_test.go → ast/function_declaration_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 func TestFunctionDeclaration_MarshalJSON(t *testing.T) {

runtime/ast/identifier.go → ast/identifier.go

@@ -21,7 +21,7 @@ package ast
 import (
 	"encoding/json"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 // Identifier

runtime/ast/import.go → ast/import.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 // ImportDeclaration

runtime/ast/import_test.go → ast/import_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 func TestImportDeclaration_MarshalJSON(t *testing.T) {

runtime/ast/inspector_test.go → ast/inspector_test.go

@@ -23,9 +23,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/onflow/cadence/runtime/ast"
-	"github.com/onflow/cadence/runtime/parser"
-	"github.com/onflow/cadence/runtime/tests/examples"
+	"github.com/onflow/cadence/ast"
+	"github.com/onflow/cadence/parser"
+	"github.com/onflow/cadence/tests/examples"
 )
 
 // TestInspector_Elements compares Inspector against Inspect.

runtime/ast/interface.go → ast/interface.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 // InterfaceDeclaration

runtime/ast/interface_test.go → ast/interface_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 func TestInterfaceDeclaration_MarshalJSON(t *testing.T) {

runtime/ast/memberindices.go → ast/memberindices.go

@@ -21,7 +21,7 @@ package ast
 import (
 	"sync"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 // programIndices is a container for all indices of members

runtime/ast/memberindices_test.go → ast/memberindices_test.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 func TestMemberIndices(t *testing.T) {

runtime/ast/members.go → ast/members.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 // Members

runtime/ast/operation.go → ast/operation.go

@@ -21,7 +21,7 @@ package ast
 import (
 	"encoding/json"
 
-	"github.com/onflow/cadence/runtime/errors"
+	"github.com/onflow/cadence/errors"
 )
 
 //go:generate go run golang.org/x/tools/cmd/stringer -type=Operation

runtime/ast/parameter.go → ast/parameter.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 type Parameter struct {

runtime/ast/parameterlist.go → ast/parameterlist.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 type ParameterList struct {

runtime/ast/position.go → ast/position.go

@@ -21,7 +21,7 @@ package ast
 import (
 	"fmt"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 var EmptyPosition = Position{}

runtime/ast/pragma.go → ast/pragma.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 // Pragma

runtime/ast/program.go → ast/program.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 type Program struct {

runtime/ast/programindices_test.go → ast/programindices_test.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 func TestProgramIndices(t *testing.T) {

runtime/ast/statement.go → ast/statement.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/turbolent/prettier"
 
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/common"
 )
 
 type Statement interface {

runtime/ast/string_test.go → ast/string_test.go

@@ -24,8 +24,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/onflow/cadence/runtime/ast"
-	"github.com/onflow/cadence/runtime/parser"
+	"github.com/onflow/cadence/ast"
+	"github.com/onflow/cadence/parser"
 )
 
 func TestQuoteString(t *testing.T) {