Merge branch 'master' into fix-fuzzer-entrypoint

OffchainLabs · Jan 31, 2024 · d08507c · d08507c
2 parents 2770f81 + f6dfe98
commit d08507c
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 34 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -117,8 +117,7 @@ jobs:
           skip-pkg-cache: true
       - name: Custom Lint
         run: |
-          go run ./linter/koanf ./...
-          go run ./linter/pointercheck ./...
+          go run ./linters ./...
 
       - name: Set environment variables
         run: |

diff --git a/Makefile b/Makefile
@@ -311,9 +311,7 @@ contracts/test/prover/proofs/%.json: $(arbitrator_cases)/%.wasm $(arbitrator_pro
 # strategic rules to minimize dependency building
 
 .make/lint: $(DEP_PREDICATE) build-node-deps $(ORDER_ONLY_PREDICATE) .make
-	go run ./linter/koanf ./...
-	go run ./linter/pointercheck ./...
-	go run ./linter/rightshift ./...
+	go run ./linters ./...
 	golangci-lint run --fix
 	yarn --cwd contracts solhint
 	@touch $@

diff --git a/linter/koanf/handlers.go → linters/koanf/handlers.go b/linter/koanf/handlers.go → linters/koanf/handlers.go
@@ -1,4 +1,4 @@
-package main
+package koanf
 
 import (
 	"fmt"

diff --git a/linter/koanf/koanf.go → linters/koanf/koanf.go b/linter/koanf/koanf.go → linters/koanf/koanf.go
@@ -1,4 +1,4 @@
-package main
+package koanf
 
 import (
 	"errors"
@@ -8,7 +8,6 @@ import (
 	"reflect"
 
 	"golang.org/x/tools/go/analysis"
-	"golang.org/x/tools/go/analysis/singlechecker"
 )
 
 var (
@@ -97,7 +96,3 @@ func run(dryRun bool, pass *analysis.Pass) (interface{}, error) {
 	}
 	return ret, nil
 }
-
-func main() {
-	singlechecker.Main(Analyzer)
-}
diff --git a/linter/koanf/koanf_test.go → linters/koanf/koanf_test.go b/linter/koanf/koanf_test.go → linters/koanf/koanf_test.go
@@ -1,4 +1,4 @@
-package main
+package koanf
 
 import (
 	"errors"

diff --git a/linters/linters.go b/linters/linters.go
@@ -0,0 +1,18 @@
+package main
+
+import (
+	"github.com/offchainlabs/nitro/linters/koanf"
+	"github.com/offchainlabs/nitro/linters/pointercheck"
+	"github.com/offchainlabs/nitro/linters/rightshift"
+	"github.com/offchainlabs/nitro/linters/structinit"
+	"golang.org/x/tools/go/analysis/multichecker"
+)
+
+func main() {
+	multichecker.Main(
+		koanf.Analyzer,
+		pointercheck.Analyzer,
+		rightshift.Analyzer,
+		structinit.Analyzer,
+	)
+}
diff --git a/linter/pointercheck/pointer.go → linters/pointercheck/pointercheck.go b/linter/pointercheck/pointer.go → linters/pointercheck/pointercheck.go
@@ -1,4 +1,4 @@
-package main
+package pointercheck
 
 import (
 	"fmt"
@@ -8,7 +8,6 @@ import (
 	"reflect"
 
 	"golang.org/x/tools/go/analysis"
-	"golang.org/x/tools/go/analysis/singlechecker"
 )
 
 var Analyzer = &analysis.Analyzer{
@@ -90,7 +89,3 @@ func ptrIdent(pass *analysis.Pass, e ast.Expr) bool {
 	}
 	return false
 }
-
-func main() {
-	singlechecker.Main(Analyzer)
-}
diff --git a/linter/pointercheck/pointer_test.go → linters/pointercheck/pointercheck_test.go b/linter/pointercheck/pointer_test.go → linters/pointercheck/pointercheck_test.go
@@ -1,4 +1,4 @@
-package main
+package pointercheck
 
 import (
 	"os"

diff --git a/linter/rightshift/rightshift.go → linters/rightshift/rightshift.go b/linter/rightshift/rightshift.go → linters/rightshift/rightshift.go
@@ -1,12 +1,11 @@
-package main
+package rightshift
 
 import (
 	"go/ast"
 	"go/token"
 	"reflect"
 
 	"golang.org/x/tools/go/analysis"
-	"golang.org/x/tools/go/analysis/singlechecker"
 )
 
 var Analyzer = &analysis.Analyzer{
@@ -70,7 +69,3 @@ func isOne(expr ast.Expr) bool {
 	bl, ok := expr.(*ast.BasicLit)
 	return ok && bl.Kind == token.INT && bl.Value == "1"
 }
-
-func main() {
-	singlechecker.Main(Analyzer)
-}
diff --git a/linter/rightshift/rightshift_test.go → linters/rightshift/rightshift_test.go b/linter/rightshift/rightshift_test.go → linters/rightshift/rightshift_test.go
@@ -1,4 +1,4 @@
-package main
+package rightshift
 
 import (
 	"os"

diff --git a/linter/structinit/structinit.go → linters/structinit/structinit.go b/linter/structinit/structinit.go → linters/structinit/structinit.go
@@ -1,4 +1,4 @@
-package main
+package structinit
 
 import (
 	"fmt"
@@ -8,7 +8,6 @@ import (
 	"strings"
 
 	"golang.org/x/tools/go/analysis"
-	"golang.org/x/tools/go/analysis/singlechecker"
 )
 
 // Tip for linter that struct that has this comment should be included in the
@@ -112,7 +111,3 @@ type position struct {
 	fileName string
 	line     int
 }
-
-func main() {
-	singlechecker.Main(Analyzer)
-}
diff --git a/linter/structinit/structinit_test.go → linters/structinit/structinit_test.go b/linter/structinit/structinit_test.go → linters/structinit/structinit_test.go
@@ -1,4 +1,4 @@
-package main
+package structinit
 
 import (
 	"os"

diff --git a/linter/testdata/src/koanf/a/a.go → linters/testdata/src/koanf/a/a.go b/linter/testdata/src/koanf/a/a.go → linters/testdata/src/koanf/a/a.go
diff --git a/linter/testdata/src/koanf/b/b.go → linters/testdata/src/koanf/b/b.go b/linter/testdata/src/koanf/b/b.go → linters/testdata/src/koanf/b/b.go
diff --git a/...testdata/src/pointercheck/pointercheck.go → ...testdata/src/pointercheck/pointercheck.go b/...testdata/src/pointercheck/pointercheck.go → ...testdata/src/pointercheck/pointercheck.go
diff --git a/linter/testdata/src/rightshift/rightshift.go → ...ers/testdata/src/rightshift/rightshift.go b/linter/testdata/src/rightshift/rightshift.go → ...ers/testdata/src/rightshift/rightshift.go
diff --git a/linter/testdata/src/structinit/a/a.go → linters/testdata/src/structinit/a/a.go b/linter/testdata/src/structinit/a/a.go → linters/testdata/src/structinit/a/a.go