bump golangci-lint & fix linter issues

Author: pk910

.github/workflows/_shared-check.yaml

@@ -36,7 +36,7 @@ jobs:
       uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
       with:
         # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-        version: v2.1.6
+        version: v2.7.2
 
         # Optional: working directory, useful for monorepos
         # working-directory: somedir

.golangci.yml

@@ -27,7 +27,7 @@ linters:
     - unparam
     - unused
     - whitespace
-    - wsl
+    - wsl_v5
   settings:
     errcheck:
       check-type-assertions: true
@@ -47,6 +47,10 @@ linters:
     nolintlint:
       require-explanation: true
       require-specific: true
+    wsl_v5:
+      allow-first-in-block: true
+      allow-whole-block: false
+      branch-max-lines: 2
   exclusions:
     generated: lax
     presets:
@@ -58,6 +62,11 @@ linters:
       - third_party$
       - builtin$
       - examples$
+    rules:
+      - linters:
+          - revive
+        text: "var-naming: avoid meaningless package names"
+        path: "pkg/coordinator/(types|web/types|web/utils|web/api)/"
 formatters:
   enable:
     - gofmt

main.go

@@ -19,6 +19,7 @@ func main() {
 	runChan := make(chan bool)
 
 	var execErr error
+
 	go func() {
 		execErr = cmd.Execute(ctx)
 
@@ -31,6 +32,7 @@ func main() {
 	case sig := <-signalChan:
 		log.Printf("Caught signal: %v, shutdown gracefully...", sig)
 		cancel()
+
 		select {
 		case <-runChan:
 			// graceful shutdown completed

pkg/coordinator/clients/consensus/block.go

@@ -43,6 +43,7 @@ func (block *Block) GetSeenBy() []*Client {
 func (block *Block) SetSeenBy(client *Client) {
 	block.seenMutex.Lock()
 	defer block.seenMutex.Unlock()
+
 	block.seenMap[client.clientIdx] = client
 }
 

pkg/coordinator/clients/consensus/blockcache.go

@@ -72,6 +72,7 @@ func NewBlockCache(ctx context.Context, logger logrus.FieldLogger, followDistanc
 				logger.WithError(err2).Errorf("uncaught panic in BlockCache.runCacheCleanup subroutine: %v, stack: %v", err, string(debug.Stack()))
 			}
 		}()
+
 		cache.runCacheCleanup(ctx)
 	}()
 
@@ -202,6 +203,7 @@ func (cache *BlockCache) GetWallclock() *ethwallclock.EthereumBeaconChain {
 
 func (cache *BlockCache) SetFinalizedCheckpoint(finalizedEpoch phase0.Epoch, finalizedRoot phase0.Root) {
 	cache.finalizedMutex.Lock()
+
 	if finalizedEpoch <= cache.finalizedEpoch {
 		cache.finalizedMutex.Unlock()
 		return

pkg/coordinator/clients/consensus/clientlogic.go

@@ -299,6 +299,7 @@ func (client *Client) processBlock(root phase0.Root, slot phase0.Slot, header *p
 	}
 
 	client.headMutex.Lock()
+
 	if bytes.Equal(client.headRoot[:], root[:]) {
 		client.headMutex.Unlock()
 		return nil
@@ -316,6 +317,7 @@ func (client *Client) processBlock(root phase0.Root, slot phase0.Slot, header *p
 
 func (client *Client) setFinalizedHead(epoch phase0.Epoch, root phase0.Root) error {
 	client.headMutex.Lock()
+
 	if bytes.Equal(client.finalizedRoot[:], root[:]) {
 		client.headMutex.Unlock()
 		return nil

pkg/coordinator/clients/consensus/forks.go

@@ -17,6 +17,7 @@ type HeadFork struct {
 func (pool *Pool) resetHeadForkCache() {
 	pool.forkCacheMutex.Lock()
 	defer pool.forkCacheMutex.Unlock()
+
 	pool.forkCache = map[int64][]*HeadFork{}
 }
 

pkg/coordinator/clients/consensus/rpc/beaconapi.go

@@ -129,8 +129,8 @@ func (bc *BeaconClient) postJSONWithHeaders(ctx context.Context, requrl string,
 	}
 
 	reader := bytes.NewReader(postDataBytes)
-	req, err := nethttp.NewRequestWithContext(ctx, "POST", requrl, reader)
 
+	req, err := nethttp.NewRequestWithContext(ctx, "POST", requrl, reader)
 	if err != nil {
 		return err
 	}
@@ -509,7 +509,7 @@ type apiAttestationData struct {
 	Data *phase0.AttestationData `json:"data"`
 }
 
-func (bc *BeaconClient) GetAttestationData(ctx context.Context, slot uint64, committeeIndex uint64) (*phase0.AttestationData, error) {
+func (bc *BeaconClient) GetAttestationData(ctx context.Context, slot, committeeIndex uint64) (*phase0.AttestationData, error) {
 	var attestationData apiAttestationData
 
 	err := bc.getJSON(ctx, fmt.Sprintf("%s/eth/v1/validator/attestation_data?slot=%d&committee_index=%d", bc.endpoint, slot, committeeIndex), &attestationData)

pkg/coordinator/clients/consensus/rpc/beaconstream.go

@@ -84,6 +84,7 @@ func (bs *BeaconStream) startStream() {
 				bs.ReadyChan <- true
 			case err := <-stream.Errors:
 				logger.WithField("client", bs.client.name).Warnf("beacon block stream error: %v", err)
+
 				select {
 				case bs.ReadyChan <- false:
 				case <-bs.ctx.Done():
@@ -136,8 +137,8 @@ func (bs *BeaconStream) subscribeStream(endpoint string, events uint16) *eventst
 		var stream *eventstream.Stream
 
 		streamURL := fmt.Sprintf("%s/eth/v1/events?topics=%v", endpoint, topics.String())
-		req, err := http.NewRequestWithContext(bs.ctx, "GET", streamURL, http.NoBody)
 
+		req, err := http.NewRequestWithContext(bs.ctx, "GET", streamURL, http.NoBody)
 		if err == nil {
 			for headerKey, headerVal := range bs.client.headers {
 				req.Header.Set(headerKey, headerVal)
@@ -148,6 +149,7 @@ func (bs *BeaconStream) subscribeStream(endpoint string, events uint16) *eventst
 
 		if err != nil {
 			logger.WithField("client", bs.client.name).Warnf("Error while subscribing beacon event stream %v: %v", getRedactedURL(streamURL), err)
+
 			select {
 			case <-bs.ctx.Done():
 				return nil
@@ -163,11 +165,11 @@ func (bs *BeaconStream) processBlockEvent(evt eventsource.Event) {
 	var parsed v1.BlockEvent
 
 	err := json.Unmarshal([]byte(evt.Data()), &parsed)
-
 	if err != nil {
 		logger.WithField("client", bs.client.name).Warnf("beacon block stream failed to decode block event: %v", err)
 		return
 	}
+
 	bs.EventChan <- &BeaconStreamEvent{
 		Event: StreamBlockEvent,
 		Data:  &parsed,

pkg/coordinator/clients/consensus/rpc/eventstream/eventstream.go

@@ -182,13 +182,15 @@ func (stream *Stream) receiveEvents(r io.ReadCloser) {
 		ev, err := dec.Decode()
 
 		stream.closeMutex.Lock()
+
 		if stream.isClosed {
 			stream.closeMutex.Unlock()
 			return
 		}
 
 		if err != nil {
 			stream.Errors <- err
+
 			stream.closeMutex.Unlock()
 
 			return
@@ -209,6 +211,7 @@ func (stream *Stream) receiveEvents(r io.ReadCloser) {
 		}
 
 		stream.Events <- pub
+
 		stream.closeMutex.Unlock()
 	}
 }
@@ -237,11 +240,14 @@ func (stream *Stream) retryRestartStream() {
 		}
 
 		stream.closeMutex.Lock()
+
 		if stream.isClosed {
 			stream.closeMutex.Unlock()
 			return
 		}
+
 		stream.Errors <- err
+
 		stream.closeMutex.Unlock()
 
 		backoff = 10 * time.Second