adjust imports

onflow · Oct 22, 2024 · b250d8b · b250d8b
1 parent 26a5dad
commit b250d8b
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 30 deletions.
diff --git a/lint/analyzers_test.go b/lint/analyzers_test.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/onflow/cadence/runtime/common"
-	"github.com/onflow/cadence/runtime/sema"
+	"github.com/onflow/cadence/common"
+	"github.com/onflow/cadence/sema"
 	"github.com/onflow/cadence/tools/analysis"
 
 	"github.com/onflow/cadence-tools/lint"

diff --git a/lint/cadence_v1_analyzer.go b/lint/cadence_v1_analyzer.go
@@ -19,9 +19,9 @@
 package lint
 
 import (
-	"github.com/onflow/cadence/runtime/ast"
-	"github.com/onflow/cadence/runtime/common"
-	"github.com/onflow/cadence/runtime/sema"
+	"github.com/onflow/cadence/ast"
+	"github.com/onflow/cadence/common"
+	"github.com/onflow/cadence/sema"
 	"github.com/onflow/cadence/tools/analysis"
 )
 

diff --git a/lint/cadence_v1_analyzer_test.go b/lint/cadence_v1_analyzer_test.go
@@ -23,10 +23,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/onflow/cadence/runtime/ast"
-	"github.com/onflow/cadence/runtime/errors"
-	"github.com/onflow/cadence/runtime/parser"
-	"github.com/onflow/cadence/runtime/sema"
+	"github.com/onflow/cadence/ast"
+	"github.com/onflow/cadence/errors"
+	"github.com/onflow/cadence/parser"
+	"github.com/onflow/cadence/sema"
 	"github.com/onflow/cadence/tools/analysis"
 
 	"github.com/onflow/cadence-tools/lint"

diff --git a/lint/deprecated_member_analyzer.go b/lint/deprecated_member_analyzer.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/onflow/cadence/runtime/ast"
+	"github.com/onflow/cadence/ast"
 	"github.com/onflow/cadence/tools/analysis"
 )
 

diff --git a/lint/deprecated_member_analyzer_test.go b/lint/deprecated_member_analyzer_test.go
@@ -21,7 +21,7 @@ package lint_test
 import (
 	"testing"
 
-	"github.com/onflow/cadence/runtime/ast"
+	"github.com/onflow/cadence/ast"
 	"github.com/onflow/cadence/tools/analysis"
 	"github.com/stretchr/testify/require"
 

diff --git a/lint/diagnostic.go b/lint/diagnostic.go
@@ -19,8 +19,8 @@
 package lint
 
 import (
-	"github.com/onflow/cadence/runtime/ast"
-	"github.com/onflow/cadence/runtime/common"
+	"github.com/onflow/cadence/ast"
+	"github.com/onflow/cadence/common"
 	"github.com/onflow/cadence/tools/analysis"
 )
 

diff --git a/lint/lint.go b/lint/lint.go
@@ -33,10 +33,9 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
-	"github.com/onflow/cadence/runtime/common"
-	"github.com/onflow/cadence/runtime/pretty"
+	"github.com/onflow/cadence/common"
+	"github.com/onflow/cadence/pretty"
 	"github.com/onflow/cadence/tools/analysis"
-	"github.com/onflow/flow-go-sdk"
 	grpcAccess "github.com/onflow/flow-go-sdk/access/grpc"
 )
 

diff --git a/lint/number_function_argument_analyzer.go b/lint/number_function_argument_analyzer.go
@@ -19,9 +19,9 @@
 package lint
 
 import (
-	"github.com/onflow/cadence/runtime/ast"
-	"github.com/onflow/cadence/runtime/common"
-	"github.com/onflow/cadence/runtime/sema"
+	"github.com/onflow/cadence/ast"
+	"github.com/onflow/cadence/common"
+	"github.com/onflow/cadence/sema"
 	"github.com/onflow/cadence/tools/analysis"
 )
 

diff --git a/lint/number_function_argument_analyzer_test.go b/lint/number_function_argument_analyzer_test.go
@@ -21,7 +21,7 @@ package lint_test
 import (
 	"testing"
 
-	"github.com/onflow/cadence/runtime/ast"
+	"github.com/onflow/cadence/ast"
 	"github.com/onflow/cadence/tools/analysis"
 	"github.com/stretchr/testify/require"
 

diff --git a/lint/redundant_cast_analyzer.go b/lint/redundant_cast_analyzer.go
@@ -21,9 +21,9 @@ package lint
 import (
 	"fmt"
 
-	"github.com/onflow/cadence/runtime/ast"
-	"github.com/onflow/cadence/runtime/errors"
-	"github.com/onflow/cadence/runtime/sema"
+	"github.com/onflow/cadence/ast"
+	"github.com/onflow/cadence/errors"
+	"github.com/onflow/cadence/sema"
 	"github.com/onflow/cadence/tools/analysis"
 )
 

diff --git a/lint/redundant_cast_analyzer_test.go b/lint/redundant_cast_analyzer_test.go
@@ -21,7 +21,7 @@ package lint_test
 import (
 	"testing"
 
-	"github.com/onflow/cadence/runtime/ast"
+	"github.com/onflow/cadence/ast"
 	"github.com/onflow/cadence/tools/analysis"
 	"github.com/stretchr/testify/require"
 

diff --git a/lint/unnecessary_force_analyzer.go b/lint/unnecessary_force_analyzer.go
@@ -19,8 +19,8 @@
 package lint
 
 import (
-	"github.com/onflow/cadence/runtime/ast"
-	"github.com/onflow/cadence/runtime/sema"
+	"github.com/onflow/cadence/ast"
+	"github.com/onflow/cadence/sema"
 	"github.com/onflow/cadence/tools/analysis"
 )
 

diff --git a/lint/unnecessary_force_analyzer_test.go b/lint/unnecessary_force_analyzer_test.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/onflow/cadence/runtime/ast"
+	"github.com/onflow/cadence/ast"
 	"github.com/onflow/cadence/tools/analysis"
 
 	"github.com/onflow/cadence-tools/lint"

diff --git a/lint/unused_result_analyzer.go b/lint/unused_result_analyzer.go
@@ -19,8 +19,8 @@
 package lint
 
 import (
-	"github.com/onflow/cadence/runtime/ast"
-	"github.com/onflow/cadence/runtime/sema"
+	"github.com/onflow/cadence/ast"
+	"github.com/onflow/cadence/sema"
 	"github.com/onflow/cadence/tools/analysis"
 )
 

diff --git a/lint/unused_result_analyzer_test.go b/lint/unused_result_analyzer_test.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/onflow/cadence/runtime/ast"
+	"github.com/onflow/cadence/ast"
 	"github.com/onflow/cadence/tools/analysis"
 
 	"github.com/onflow/cadence-tools/lint"