cometbft · thanethomson · Nov 15, 2023 · Oct 16, 2023 · Oct 17, 2023 · Oct 17, 2023
@@ -0,0 +1,2 @@
+- Split E2E test framework and E2E test app out as separate Go modules
+  ([\#1484](https://github.com/cometbft/cometbft/issues/1484))
@@ -0,0 +1,2 @@
+- `[blocksync]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[consensus]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[evidence]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[inspect]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/autofile]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/bits]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/clist]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/cmap]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/events]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/fail]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/flowrate]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/net]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/os]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/progressbar]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/protoio]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/pubsub]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/rand]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/service]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/strings]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/sync]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/tempfile]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/timer]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[libs/async]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[state]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[statesync]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -0,0 +1,2 @@
+- `[store]` Move to `internal`
+  ([\#1485](https://github.com/cometbft/cometbft/pull/1485))
@@ -19,6 +19,14 @@ jobs:
     name: golangci-lint
     runs-on: ubuntu-latest
     timeout-minutes: 8
+    strategy:
+      matrix:
+        # One entry per distinct Go module/submodule.
+        workdir:
+          - ''
+          - 'test/e2e'
+          - 'test/e2e/app'
+          - 'test/loadtime'
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
@@ -28,11 +36,12 @@ jobs:
         with:
           PATTERNS: |
             **/**.go
-            go.mod
-            go.sum
+            **/go.mod
+            **/go.sum
       - uses: golangci/golangci-lint-action@v3
         with:
           version: latest
           args: --timeout 10m
           github-token: ${{ secrets.github_token }}
+          working-directory: ${{ matrix.workdir }}
         if: env.GIT_DIFF
@@ -62,3 +62,5 @@ proto/spec/**/*.pb.go
 *.dvi
 # Python virtual environments
 .venv
+go.work
+go.work.sum
@@ -231,6 +231,9 @@ format:
 lint:
 	@echo "--> Running linter"
 	@go run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run
+	@$(MAKE) -C ./test/e2e/ lint
+	@$(MAKE) -C ./test/e2e/app/ lint
+	@$(MAKE) -C ./test/loadtime/ lint
 .PHONY: lint
 
 vulncheck:

@@ -5,8 +5,8 @@ import (
 	"sync"
 
 	"github.com/cometbft/cometbft/abci/types"
-	"github.com/cometbft/cometbft/libs/service"
-	cmtsync "github.com/cometbft/cometbft/libs/sync"
+	"github.com/cometbft/cometbft/internal/service"
+	cmtsync "github.com/cometbft/cometbft/internal/sync"
 )
 
 const (

@@ -11,8 +11,8 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/cometbft/cometbft/abci/types"
-	cmtnet "github.com/cometbft/cometbft/libs/net"
-	"github.com/cometbft/cometbft/libs/service"
+	cmtnet "github.com/cometbft/cometbft/internal/net"
+	"github.com/cometbft/cometbft/internal/service"
 )
 
 var _ Client = (*grpcClient)(nil)

@@ -14,10 +14,11 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/cometbft/cometbft/libs/log"
-	cmtnet "github.com/cometbft/cometbft/libs/net"
 	"google.golang.org/grpc/credentials/insecure"
 
+	cmtnet "github.com/cometbft/cometbft/internal/net"
+	"github.com/cometbft/cometbft/libs/log"
+
 	abciserver "github.com/cometbft/cometbft/abci/server"
 	"github.com/cometbft/cometbft/abci/types"
 )

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	types "github.com/cometbft/cometbft/abci/types"
-	"github.com/cometbft/cometbft/libs/service"
-	cmtsync "github.com/cometbft/cometbft/libs/sync"
+	"github.com/cometbft/cometbft/internal/service"
+	cmtsync "github.com/cometbft/cometbft/internal/sync"
 )
 
 // NOTE: use defer to unlock mutex because Application might panic (e.g., in

@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/cometbft/cometbft/abci/types"
-	cmtnet "github.com/cometbft/cometbft/libs/net"
-	"github.com/cometbft/cometbft/libs/service"
-	"github.com/cometbft/cometbft/libs/timer"
+	cmtnet "github.com/cometbft/cometbft/internal/net"
+	"github.com/cometbft/cometbft/internal/service"
+	"github.com/cometbft/cometbft/internal/timer"
 )
 
 const (

@@ -15,8 +15,8 @@ import (
 	abcicli "github.com/cometbft/cometbft/abci/client"
 	"github.com/cometbft/cometbft/abci/server"
 	"github.com/cometbft/cometbft/abci/types"
-	cmtrand "github.com/cometbft/cometbft/libs/rand"
-	"github.com/cometbft/cometbft/libs/service"
+	cmtrand "github.com/cometbft/cometbft/internal/rand"
+	"github.com/cometbft/cometbft/internal/service"
 )
 
 func TestCalls(t *testing.T) {

@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	types "github.com/cometbft/cometbft/abci/types"
-	"github.com/cometbft/cometbft/libs/service"
+	"github.com/cometbft/cometbft/internal/service"
 )
 
 type unsyncLocalClient struct {

@@ -11,8 +11,8 @@ import (
 
 	"github.com/spf13/cobra"
 
+	cmtos "github.com/cometbft/cometbft/internal/os"
 	"github.com/cometbft/cometbft/libs/log"
-	cmtos "github.com/cometbft/cometbft/libs/os"
 
 	abcicli "github.com/cometbft/cometbft/abci/client"
 	"github.com/cometbft/cometbft/abci/example/kvstore"

@@ -8,7 +8,7 @@ import (
 
 	"github.com/cometbft/cometbft/abci/types"
 	cryptoencoding "github.com/cometbft/cometbft/crypto/encoding"
-	cmtrand "github.com/cometbft/cometbft/libs/rand"
+	cmtrand "github.com/cometbft/cometbft/internal/rand"
 	"github.com/cometbft/cometbft/proto/tendermint/crypto"
 )
 

@@ -8,8 +8,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/cometbft/cometbft/internal/service"
 	"github.com/cometbft/cometbft/libs/log"
-	"github.com/cometbft/cometbft/libs/service"
 
 	abcicli "github.com/cometbft/cometbft/abci/client"
 	abciserver "github.com/cometbft/cometbft/abci/server"

@@ -7,8 +7,8 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/cometbft/cometbft/abci/types"
-	cmtnet "github.com/cometbft/cometbft/libs/net"
-	"github.com/cometbft/cometbft/libs/service"
+	cmtnet "github.com/cometbft/cometbft/internal/net"
+	"github.com/cometbft/cometbft/internal/service"
 )
 
 type GRPCServer struct {

@@ -9,7 +9,7 @@ package server
 
 import (
 	"github.com/cometbft/cometbft/abci/types"
-	"github.com/cometbft/cometbft/libs/service"
+	"github.com/cometbft/cometbft/internal/service"
 )
 
 // NewServer is a utility function for out of process applications to set up either a socket or

@@ -11,10 +11,10 @@ import (
 	"runtime"
 
 	"github.com/cometbft/cometbft/abci/types"
+	cmtnet "github.com/cometbft/cometbft/internal/net"
+	"github.com/cometbft/cometbft/internal/service"
+	cmtsync "github.com/cometbft/cometbft/internal/sync"
 	cmtlog "github.com/cometbft/cometbft/libs/log"
-	cmtnet "github.com/cometbft/cometbft/libs/net"
-	"github.com/cometbft/cometbft/libs/service"
-	cmtsync "github.com/cometbft/cometbft/libs/sync"
 )
 
 // SocketServer is the server-side implementation of the TSP (Tendermint Socket Protocol)
@@ -162,7 +162,7 @@ func (s *SocketServer) waitForClose(closeConn chan error, connID int) {
 // Read requests from conn and deal with them
 func (s *SocketServer) handleRequests(closeConn chan error, conn io.Reader, responses chan<- *types.Response) {
 	var count int
-	var bufReader = bufio.NewReader(conn)
+	bufReader := bufio.NewReader(conn)
 
 	defer func() {
 		// make sure to recover from any app-related panics to allow proper socket cleanup.
@@ -184,7 +184,7 @@ func (s *SocketServer) handleRequests(closeConn chan error, conn io.Reader, resp
 
 	for {
 
-		var req = &types.Request{}
+		req := &types.Request{}
 		err := types.ReadMessage(bufReader, req)
 		if err != nil {
 			if err == io.EOF {
@@ -308,9 +308,9 @@ func (s *SocketServer) handleRequest(ctx context.Context, req *types.Request) (*
 // Pull responses from 'responses' and write them to conn.
 func (s *SocketServer) handleResponses(closeConn chan error, conn io.Writer, responses <-chan *types.Response) {
 	var count int
-	var bufWriter = bufio.NewWriter(conn)
+	bufWriter := bufio.NewWriter(conn)
 	for {
-		var res = <-responses
+		res := <-responses
 		err := types.WriteMessage(res, bufWriter)
 		if err != nil {
 			closeConn <- fmt.Errorf("error writing message: %w", err)

@@ -6,11 +6,10 @@ import (
 	"log"
 
 	"github.com/cometbft/cometbft/abci/types"
-	cmtnet "github.com/cometbft/cometbft/libs/net"
+	cmtnet "github.com/cometbft/cometbft/internal/net"
 )
 
 func main() {
-
 	conn, err := cmtnet.Connect("unix://test.sock")
 	if err != nil {
 		log.Fatal(err.Error())
@@ -20,7 +19,7 @@ func main() {
 	go func() {
 		counter := 0
 		for {
-			var res = &types.Response{}
+			res := &types.Response{}
 			err := types.ReadMessage(conn, res)
 			if err != nil {
 				log.Fatal(err.Error())
@@ -35,8 +34,8 @@ func main() {
 	// Write a bunch of requests
 	counter := 0
 	for i := 0; ; i++ {
-		var bufWriter = bufio.NewWriter(conn)
-		var req = types.ToRequestEcho("foobar")
+		bufWriter := bufio.NewWriter(conn)
+		req := types.ToRequestEcho("foobar")
 
 		err := types.WriteMessage(req, bufWriter)
 		if err != nil {

@@ -8,11 +8,10 @@ import (
 	"reflect"
 
 	"github.com/cometbft/cometbft/abci/types"
-	cmtnet "github.com/cometbft/cometbft/libs/net"
+	cmtnet "github.com/cometbft/cometbft/internal/net"
 )
 
 func main() {
-
 	conn, err := cmtnet.Connect("unix://test.sock")
 	if err != nil {
 		log.Fatal(err.Error())
@@ -34,7 +33,7 @@ func main() {
 }
 
 func makeRequest(conn io.ReadWriter, req *types.Request) (*types.Response, error) {
-	var bufWriter = bufio.NewWriter(conn)
+	bufWriter := bufio.NewWriter(conn)
 
 	// Write desired request
 	err := types.WriteMessage(req, bufWriter)
@@ -51,12 +50,12 @@ func makeRequest(conn io.ReadWriter, req *types.Request) (*types.Response, error
 	}
 
 	// Read desired response
-	var res = &types.Response{}
+	res := &types.Response{}
 	err = types.ReadMessage(conn, res)
 	if err != nil {
 		return nil, err
 	}
-	var resFlush = &types.Response{}
+	resFlush := &types.Response{}
 	err = types.ReadMessage(conn, resFlush)
 	if err != nil {
 		return nil, err
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Split E2E test framework and E2E test app out as separate Go modules
		([\#1484](https://github.com/cometbft/cometbft/issues/1484))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- `[blocksync]` Move to `internal`
		([\#1485](https://github.com/cometbft/cometbft/pull/1485))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- `[consensus]` Move to `internal`
		([\#1485](https://github.com/cometbft/cometbft/pull/1485))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- `[evidence]` Move to `internal`
		([\#1485](https://github.com/cometbft/cometbft/pull/1485))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- `[inspect]` Move to `internal`
		([\#1485](https://github.com/cometbft/cometbft/pull/1485))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- `[libs/autofile]` Move to `internal`
		([\#1485](https://github.com/cometbft/cometbft/pull/1485))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- `[libs/bits]` Move to `internal`
		([\#1485](https://github.com/cometbft/cometbft/pull/1485))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- `[libs/clist]` Move to `internal`
		([\#1485](https://github.com/cometbft/cometbft/pull/1485))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- `[libs/cmap]` Move to `internal`
		([\#1485](https://github.com/cometbft/cometbft/pull/1485))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- `[libs/events]` Move to `internal`
		([\#1485](https://github.com/cometbft/cometbft/pull/1485))