formatting: format code and imports with gci

.golangci.yaml

@@ -21,7 +21,7 @@ run:
 
 # output configuration options
 output:
-  formats: 
+  formats:
     - format: colored-line-number
 
   # print lines of code with issue, default is true
@@ -39,6 +39,16 @@ output:
 
 # all available settings of specific linters
 linters-settings:
+  gci:
+    sections:
+      - standard
+      - default
+      - blank
+      - dot
+      - localmodule
+      - prefix(github.com/ssvlabs/ssv-spec)
+    # various configuration options are listed here: https://golangci-lint.run/usage/linters/#gci
+    skip-generated: true
   dogsled:
     # checks assignments with too many blank identifiers; default is 2
     max-blank-identifiers: 2
@@ -76,10 +86,6 @@ linters-settings:
   funlen:
     lines: 60
     statements: 40
-  gci:
-    # Custom section: groups all imports with the specified Prefix.
-    sections:
-      - prefix(github.com/ssvlabs/ssv)
   gocognit:
     # minimal code complexity to report, 30 by default (but we recommend 10-20)
     min-complexity: 10
@@ -180,8 +186,6 @@ linters-settings:
       - return
       - assign
   govet:
-
-
     # settings per analyzer
     settings:
       printf: # analyzer name, run `go tool vet help` to see all analyzers
@@ -328,6 +332,7 @@ linters:
     - gosec
     - errcheck
     - errorlint
+    - gci
 
   disable-all: false
 
@@ -405,4 +410,4 @@ issues:
   #  new-from-patch: path/to/patch/file
 
   # Fix found issues (if it's supported by the linter)
-  fix: true
+  fix: false

Makefile

@@ -164,8 +164,4 @@ mockgen-install:
 
 .PHONY: format
 format:
-# both format commands must ignore generated files which are named *mock* or enr_fork_id_encoding.go
-# the argument to gopls format can be a list of files
-	find . -name "*.go" ! -path '*mock*' ! -name 'enr_fork_id_encoding.go' -type f -print0 | xargs -0 -P 1 sh -c 'gopls -v format -w $0'
-# the argument to gopls imports must be a single file so this entire command takes a few mintues to run
-	find . -name "*.go" ! -path '*mock*' ! -name 'enr_fork_id_encoding.go' -type f -print0 | xargs -0 -P 10 -I{} sh -c 'gopls -v imports -w "{}"'
+	gci write --skip-generated -s standard -s default -s blank -s dot -s localmodule -s "prefix(github.com/ssvlabs/ssv-spec)" $$(find . -type f -name '*.go')

api/handlers/exporter.go

@@ -6,12 +6,13 @@ import (
 	"net/http"
 
 	"github.com/attestantio/go-eth2-client/spec/phase0"
+
 	spectypes "github.com/ssvlabs/ssv-spec/types"
-	"github.com/ssvlabs/ssv/networkconfig"
-	qbftstorage "github.com/ssvlabs/ssv/protocol/v2/qbft/storage"
 
 	"github.com/ssvlabs/ssv/api"
 	ibftstorage "github.com/ssvlabs/ssv/ibft/storage"
+	"github.com/ssvlabs/ssv/networkconfig"
+	qbftstorage "github.com/ssvlabs/ssv/protocol/v2/qbft/storage"
 )
 
 type Exporter struct {

api/handlers/validators.go

@@ -7,7 +7,9 @@ import (
 	"strings"
 
 	"github.com/attestantio/go-eth2-client/spec/phase0"
+
 	spectypes "github.com/ssvlabs/ssv-spec/types"
+
 	"github.com/ssvlabs/ssv/api"
 	"github.com/ssvlabs/ssv/protocol/v2/types"
 	registrystorage "github.com/ssvlabs/ssv/registry/storage"

api/handlers/validators_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	spectypes "github.com/ssvlabs/ssv-spec/types"
+
 	"github.com/ssvlabs/ssv/protocol/v2/types"
 )
 

beacon/goclient/attest_test.go

@@ -13,10 +13,11 @@ import (
 	"github.com/attestantio/go-eth2-client/spec"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/sourcegraph/conc/pool"
-	"github.com/ssvlabs/ssv-spec/types"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 
+	"github.com/ssvlabs/ssv-spec/types"
+
 	operatordatastore "github.com/ssvlabs/ssv/operator/datastore"
 	"github.com/ssvlabs/ssv/operator/slotticker"
 	"github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon"

beacon/goclient/goclient.go

@@ -19,11 +19,12 @@ import (
 	"github.com/jellydator/ttlcache/v3"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
-	specssv "github.com/ssvlabs/ssv-spec/ssv"
-	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"go.uber.org/zap"
 	"tailscale.com/util/singleflight"
 
+	specssv "github.com/ssvlabs/ssv-spec/ssv"
+	spectypes "github.com/ssvlabs/ssv-spec/types"
+
 	"github.com/ssvlabs/ssv/logging/fields"
 	operatordatastore "github.com/ssvlabs/ssv/operator/datastore"
 	"github.com/ssvlabs/ssv/operator/slotticker"

beacon/goclient/goclient_test.go

@@ -13,10 +13,11 @@ import (
 	"github.com/attestantio/go-eth2-client/api"
 	v1 "github.com/attestantio/go-eth2-client/api/v1"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
-	"github.com/ssvlabs/ssv-spec/types"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 
+	"github.com/ssvlabs/ssv-spec/types"
+
 	operatordatastore "github.com/ssvlabs/ssv/operator/datastore"
 	"github.com/ssvlabs/ssv/operator/slotticker"
 	"github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon"

beacon/goclient/observability.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/attestantio/go-eth2-client/api"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
-
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"

beacon/goclient/proposer.go

@@ -20,9 +20,10 @@ import (
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	ssz "github.com/ferranbt/fastssz"
 	"github.com/sourcegraph/conc/pool"
-	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"go.uber.org/zap"
 
+	spectypes "github.com/ssvlabs/ssv-spec/types"
+
 	"github.com/ssvlabs/ssv/logging/fields"
 	"github.com/ssvlabs/ssv/operator/slotticker"
 )

beacon/goclient/signing.go

@@ -13,8 +13,9 @@ import (
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	ssz "github.com/ferranbt/fastssz"
 	"github.com/pkg/errors"
-	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"go.uber.org/zap"
+
+	spectypes "github.com/ssvlabs/ssv-spec/types"
 )
 
 func (gc *GoClient) computeVoluntaryExitDomain(ctx context.Context) (phase0.Domain, error) {

beacon/goclient/sync_committee.go

@@ -8,11 +8,10 @@ import (
 
 	"github.com/attestantio/go-eth2-client/api"
 	eth2apiv1 "github.com/attestantio/go-eth2-client/api/v1"
-	"go.uber.org/zap"
-
 	"github.com/attestantio/go-eth2-client/spec"
 	"github.com/attestantio/go-eth2-client/spec/altair"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
+	"go.uber.org/zap"
 )
 
 // SyncCommitteeDuties returns sync committee duties for a given epoch

beacon/goclient/sync_committee_contribution.go

@@ -12,9 +12,10 @@ import (
 	"github.com/attestantio/go-eth2-client/spec/altair"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	ssz "github.com/ferranbt/fastssz"
-	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
+
+	spectypes "github.com/ssvlabs/ssv-spec/types"
 )
 
 // IsSyncCommitteeAggregator returns tru if aggregator

cli/bootnode/boot_node.go

@@ -4,17 +4,15 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/ssvlabs/ssv/networkconfig"
-	"github.com/ssvlabs/ssv/utils/commons"
-
-	"github.com/ssvlabs/ssv/logging"
-
 	"github.com/ilyakaznacheev/cleanenv"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 
 	global_config "github.com/ssvlabs/ssv/cli/config"
+	"github.com/ssvlabs/ssv/logging"
+	"github.com/ssvlabs/ssv/networkconfig"
 	bootnode "github.com/ssvlabs/ssv/utils/boot_node"
+	"github.com/ssvlabs/ssv/utils/commons"
 )
 
 type config struct {

cli/generate_operator_keys.go

@@ -5,13 +5,12 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ssvlabs/ssv/operator/keystore"
-
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 
 	"github.com/ssvlabs/ssv/logging"
 	"github.com/ssvlabs/ssv/operator/keys"
+	"github.com/ssvlabs/ssv/operator/keystore"
 )
 
 var generateOperatorKeysCmd = &cobra.Command{

cli/operator/node.go

@@ -19,9 +19,10 @@ import (
 	"github.com/ilyakaznacheev/cleanenv"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	spectypes "github.com/ssvlabs/ssv-spec/types"
 	"go.uber.org/zap"
 
+	spectypes "github.com/ssvlabs/ssv-spec/types"
+
 	"github.com/ssvlabs/ssv/api/handlers"
 	apiserver "github.com/ssvlabs/ssv/api/server"
 	"github.com/ssvlabs/ssv/beacon/goclient"

cli/threshold.go

@@ -8,11 +8,10 @@ import (
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 
+	"github.com/ssvlabs/ssv/cli/flags"
 	"github.com/ssvlabs/ssv/logging"
 	ssvtypes "github.com/ssvlabs/ssv/protocol/v2/types"
 	"github.com/ssvlabs/ssv/utils/threshold"
-
-	"github.com/ssvlabs/ssv/cli/flags"
 )
 
 // createThreshold is the command to create threshold based on the given private key

e2e/beacon_proxy/intercept/slashinginterceptor/attestations.go

@@ -4,10 +4,11 @@ import (
 	"context"
 	"crypto/rand"
 	"fmt"
+	"sort"
+
 	v1 "github.com/attestantio/go-eth2-client/api/v1"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"go.uber.org/zap"
-	"sort"
 )
 
 type AttesterSlashingTest struct {

e2e/beacon_proxy/intercept/slashinginterceptor/proposals.go

@@ -5,12 +5,13 @@ import (
 	"crypto/rand"
 	"encoding/json"
 	"fmt"
+	"sort"
+
 	v1 "github.com/attestantio/go-eth2-client/api/v1"
 	"github.com/attestantio/go-eth2-client/spec"
 	"github.com/attestantio/go-eth2-client/spec/capella"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"go.uber.org/zap"
-	"sort"
 )
 
 type ProposerSlashingTest struct {

e2e/beacon_proxy/intercept/slashinginterceptor/slashing.go

@@ -8,11 +8,11 @@ import (
 	v1 "github.com/attestantio/go-eth2-client/api/v1"
 	"github.com/attestantio/go-eth2-client/spec"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
-	"github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon"
 	"go.uber.org/zap"
 	"golang.org/x/exp/maps"
 
 	beaconproxy "github.com/ssvlabs/ssv/e2e/beacon_proxy"
+	"github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon"
 )
 
 const startEndEpochsDiff = 2

e2e/cmd/ssv-e2e/beacon_proxy.go

@@ -13,12 +13,12 @@ import (
 	"github.com/attestantio/go-eth2-client/http"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/rs/zerolog"
-	"github.com/ssvlabs/ssv/networkconfig"
 	"go.uber.org/zap"
 	"golang.org/x/exp/maps"
 
 	beaconproxy "github.com/ssvlabs/ssv/e2e/beacon_proxy"
 	"github.com/ssvlabs/ssv/e2e/beacon_proxy/intercept/slashinginterceptor"
+	"github.com/ssvlabs/ssv/networkconfig"
 )
 
 type BeaconProxyCmd struct {

e2e/cmd/ssv-e2e/share_update.go

@@ -9,7 +9,11 @@ import (
 	"path/filepath"
 
 	"github.com/attestantio/go-eth2-client/spec/phase0"
+	"go.uber.org/zap"
+	"gopkg.in/yaml.v3"
+
 	"github.com/ssvlabs/ssv-spec/types"
+
 	"github.com/ssvlabs/ssv/e2e/logs_catcher"
 	"github.com/ssvlabs/ssv/ekm"
 	"github.com/ssvlabs/ssv/networkconfig"
@@ -18,8 +22,6 @@ import (
 	"github.com/ssvlabs/ssv/storage/kv"
 	"github.com/ssvlabs/ssv/utils/blskeygen"
 	"github.com/ssvlabs/ssv/utils/rsaencryption"
-	"go.uber.org/zap"
-	"gopkg.in/yaml.v3"
 )
 
 type ShareUpdateCmd struct {

e2e/logs_catcher/docker/docker_reader.go

@@ -3,12 +3,14 @@ package docker
 import (
 	"bufio"
 	"context"
+	"io"
+	"strings"
+
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
 	"github.com/pkg/errors"
+
 	"github.com/ssvlabs/ssv/e2e/logs_catcher/logs"
-	"io"
-	"strings"
 )
 
 type Streamer interface {

e2e/logs_catcher/docker/restarter.go

@@ -2,6 +2,7 @@ package docker
 
 import (
 	"context"
+
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
 )

e2e/logs_catcher/logs.go

@@ -3,10 +3,12 @@ package logs_catcher
 import (
 	"context"
 	"fmt"
+
 	"github.com/pkg/errors"
+	"go.uber.org/zap"
+
 	"github.com/ssvlabs/ssv/e2e/logs_catcher/docker"
 	"github.com/ssvlabs/ssv/e2e/logs_catcher/parser"
-	"go.uber.org/zap"
 )
 
 const MesasgeKey = "msg" // todo: pass to struct/load from config

e2e/logs_catcher/logs_test.go

@@ -3,9 +3,10 @@ package logs_catcher
 import (
 	"context"
 	"encoding/binary"
+	"io"
+
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
-	"io"
 )
 
 type mockDockerClient struct {