fix: fix lint issues and update golangci-lint configuration

Author: akrem-chabchoub

.golangci.bck.yml

@@ -0,0 +1,75 @@
+run:
+  timeout: 10m
+linters:
+  enable:
+    - asciicheck
+    - bidichk
+    - copyloopvar
+    - dogsled
+    - durationcheck
+    - errcheck
+    - errname
+    - errorlint
+    - forbidigo
+    - gochecknoinits
+    - goconst
+    - gofmt
+    - goheader
+    - goprintffuncname
+    - gosimple
+    - govet
+    - importas
+    - ineffassign
+    - misspell
+    - nilerr
+    - noctx
+    - paralleltest
+    - prealloc
+    - predeclared
+    - promlinter
+    - staticcheck
+    - thelper
+    - typecheck
+    - unconvert
+    - unused
+    # - depguard disable temporary until this issue is resolved: https://github.com/golangci/golangci-lint/issues/3906
+
+linters-settings:
+  govet:
+    enable-all: true
+    disable:
+      - fieldalignment ## temporally disabled
+      - shadow ## temporally disabled
+  goheader:
+    values:
+      regexp:
+        date: "20[1-2][0-9]"
+    template: |-
+      Copyright {{date}} The Swarm Authors. All rights reserved.
+      Use of this source code is governed by a BSD-style
+      license that can be found in the LICENSE file.
+  paralleltest:
+    # Ignore missing calls to `t.Parallel()` and only report incorrect uses of `t.Parallel()`.
+    ignore-missing: true
+issues:
+  exclude-rules:
+    - linters:
+        - goheader
+      text: "go-ethereum Authors" ## disable check for other authors
+    - path: _test\.go
+      linters:
+        - goconst ## temporally disable goconst in test
+    - linters:
+        - forbidigo
+      path: cmd/bee/cmd
+      text: "use of `fmt.Print" ## allow fmt.Print in cmd directory
+    - linters:
+        - dogsled
+      path: pkg/api/(.+)_test\.go # temporally disable dogsled in api test files
+    - linters:
+        - dogsled
+      path: pkg/pushsync/(.+)_test\.go # temporally disable dogsled in pushsync test files
+      # temporally disable paralleltest in following packages
+    - linters:
+        - paralleltest
+      path: pkg/log

.golangci.yml

@@ -1,77 +1,81 @@
-version: 2
-run:
-  timeout: 10m
+version: "2"
 linters:
   enable:
     - asciicheck
     - bidichk
     - copyloopvar
     - dogsled
     - durationcheck
-    - errcheck
     - errname
     - errorlint
     - forbidigo
     - gochecknoinits
     - goconst
     - goheader
     - goprintffuncname
-    - govet
     - importas
-    - ineffassign
     - misspell
     - nilerr
     - noctx
     - paralleltest
     - prealloc
     - predeclared
     - promlinter
-    - staticcheck
     - thelper
     - unconvert
-    - unused
-    # - depguard disable temporary until this issue is resolved: https://github.com/golangci/golangci-lint/issues/3906
-
+  settings:
+    goheader:
+      values:
+        regexp:
+          date: 20[1-2][0-9]
+      template: |-
+        Copyright {{date}} The Swarm Authors. All rights reserved.
+        Use of this source code is governed by a BSD-style
+        license that can be found in the LICENSE file.
+    govet:
+      disable:
+        - fieldalignment
+        - shadow
+      enable-all: true
+    paralleltest:
+      ignore-missing: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - goheader
+        text: go-ethereum Authors
+      - linters:
+          - goconst
+        path: _test\.go
+      - linters:
+          - forbidigo
+        path: cmd/bee/cmd
+        text: use of `fmt.Print
+      - linters:
+          - dogsled
+        path: pkg/api/(.+)_test\.go
+      - linters:
+          - dogsled
+        path: pkg/pushsync/(.+)_test\.go
+      - linters:
+          - paralleltest
+        path: pkg/log
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 formatters:
   enable:
     - gofmt
-
-linters-settings:
-  govet:
-    enable-all: true
-    disable:
-      - fieldalignment ## temporally disabled
-      - shadow ## temporally disabled
-  goheader:
-    values:
-      regexp:
-        date: "20[1-2][0-9]"
-    template: |-
-      Copyright {{date}} The Swarm Authors. All rights reserved.
-      Use of this source code is governed by a BSD-style
-      license that can be found in the LICENSE file.
-  paralleltest:
-    # Ignore missing calls to `t.Parallel()` and only report incorrect uses of `t.Parallel()`.
-    ignore-missing: true
-issues:
-  exclude-rules:
-    - linters:
-        - goheader
-      text: "go-ethereum Authors" ## disable check for other authors
-    - path: _test\.go
-      linters:
-        - goconst ## temporally disable goconst in test
-    - linters:
-        - forbidigo
-      path: cmd/bee/cmd
-      text: "use of `fmt.Print" ## allow fmt.Print in cmd directory
-    - linters:
-        - dogsled
-      path: pkg/api/(.+)_test\.go # temporally disable dogsled in api test files
-    - linters:
-        - dogsled
-      path: pkg/pushsync/(.+)_test\.go # temporally disable dogsled in pushsync test files
-      # temporally disable paralleltest in following packages
-    - linters:
-        - paralleltest
-      path: pkg/log
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

cmd/bee/cmd/split.go

@@ -116,13 +116,13 @@ func splitRefs(cmd *cobra.Command) {
 			}
 
 			logger.Debug("write root", "hash", rootRef)
-			_, err = writer.WriteString(fmt.Sprintf("%s\n", rootRef))
+			_, err = fmt.Fprintf(writer, "%s\n", rootRef)
 			if err != nil {
 				return fmt.Errorf("write root hash: %w", err)
 			}
 			for _, ref := range refs {
 				logger.Debug("write chunk", "hash", ref)
-				_, err = writer.WriteString(fmt.Sprintf("%s\n", ref))
+				_, err = fmt.Fprintf(writer, "%s\n", ref)
 				if err != nil {
 					return fmt.Errorf("write chunk address: %w", err)
 				}

pkg/accesscontrol/access.go

@@ -129,7 +129,7 @@ func (al *ActLogic) getAccessKey(ctx context.Context, storage kvs.KeyValueStore,
 // Generate lookup key and access key decryption key for a given public key.
 func (al *ActLogic) getKeys(publicKey *ecdsa.PublicKey) ([]byte, []byte, error) {
 	nonces := [][]byte{zeroByteArray, oneByteArray}
-	keys, err := al.Session.Key(publicKey, nonces)
+	keys, err := al.Key(publicKey, nonces)
 	if len(keys) != len(nonces) {
 		return nil, nil, err
 	}

pkg/accesscontrol/controller.go

@@ -261,7 +261,7 @@ func (c *ControllerStruct) getGranteeList(ctx context.Context, ls file.LoadSaver
 }
 
 func (c *ControllerStruct) encryptRefForPublisher(publisherPubKey *ecdsa.PublicKey, ref swarm.Address) (swarm.Address, error) {
-	keys, err := c.access.Session.Key(publisherPubKey, [][]byte{oneByteArray})
+	keys, err := c.access.Key(publisherPubKey, [][]byte{oneByteArray})
 	if err != nil {
 		return swarm.ZeroAddress, err
 	}
@@ -275,7 +275,7 @@ func (c *ControllerStruct) encryptRefForPublisher(publisherPubKey *ecdsa.PublicK
 }
 
 func (c *ControllerStruct) decryptRefForPublisher(publisherPubKey *ecdsa.PublicKey, encryptedRef swarm.Address) (swarm.Address, error) {
-	keys, err := c.access.Session.Key(publisherPubKey, [][]byte{oneByteArray})
+	keys, err := c.access.Key(publisherPubKey, [][]byte{oneByteArray})
 	if err != nil {
 		return swarm.ZeroAddress, err
 	}

pkg/accesscontrol/controller_test.go

@@ -178,7 +178,7 @@ func TestController_UpdateHandler(t *testing.T) {
 	publisher := getPrivKey(1)
 	diffieHellman := accesscontrol.NewDefaultSession(publisher)
 	al := accesscontrol.NewLogic(diffieHellman)
-	keys, err := al.Session.Key(&publisher.PublicKey, [][]byte{{1}})
+	keys, err := al.Key(&publisher.PublicKey, [][]byte{{1}})
 	assertNoError(t, "Session key", err)
 	refCipher := encryption.New(keys[0], 0, 0, sha3.NewLegacyKeccak256)
 	ls := createLs()

pkg/accesscontrol/session.go

@@ -37,7 +37,7 @@ func (s *SessionStruct) Key(publicKey *ecdsa.PublicKey, nonces [][]byte) ([][]by
 	if publicKey == nil {
 		return nil, ErrInvalidPublicKey
 	}
-	x, y := publicKey.Curve.ScalarMult(publicKey.X, publicKey.Y, s.key.D.Bytes())
+	x, y := publicKey.ScalarMult(publicKey.X, publicKey.Y, s.key.D.Bytes())
 	if x == nil || y == nil {
 		return nil, ErrSecretKeyInfinity
 	}

pkg/api/api_test.go

@@ -266,7 +266,7 @@ func newTestServer(t *testing.T, o testServerOptions) (*http.Client, *websocket.
 				transport = transport.Clone()
 				// always dial to the server address, regardless of the url host and port
 				transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
-					return net.Dial(network, ts.Listener.Addr().String())
+					return (&net.Dialer{}).DialContext(ctx, network, ts.Listener.Addr().String())
 				}
 				return transport.RoundTrip(r)
 			}),

pkg/api/chequebook.go

@@ -118,9 +118,9 @@ func (s *Service) chequebookLastPeerHandler(w http.ResponseWriter, r *http.Reque
 	}
 	if err == nil {
 		lastSentResponse = &chequebookLastChequePeerResponse{
-			Beneficiary: lastSent.Cheque.Beneficiary.String(),
-			Chequebook:  lastSent.Cheque.Chequebook.String(),
-			Payout:      bigint.Wrap(lastSent.Cheque.CumulativePayout),
+			Beneficiary: lastSent.Beneficiary.String(),
+			Chequebook:  lastSent.Chequebook.String(),
+			Payout:      bigint.Wrap(lastSent.CumulativePayout),
 		}
 	}
 
@@ -134,9 +134,9 @@ func (s *Service) chequebookLastPeerHandler(w http.ResponseWriter, r *http.Reque
 	}
 	if err == nil {
 		lastReceivedResponse = &chequebookLastChequePeerResponse{
-			Beneficiary: lastReceived.Cheque.Beneficiary.String(),
-			Chequebook:  lastReceived.Cheque.Chequebook.String(),
-			Payout:      bigint.Wrap(lastReceived.Cheque.CumulativePayout),
+			Beneficiary: lastReceived.Beneficiary.String(),
+			Chequebook:  lastReceived.Chequebook.String(),
+			Payout:      bigint.Wrap(lastReceived.CumulativePayout),
 		}
 	}
 
@@ -179,9 +179,9 @@ func (s *Service) chequebookAllLastHandler(w http.ResponseWriter, _ *http.Reques
 		lcr[i] = chequebookLastChequesPeerResponse{
 			Peer: i,
 			LastSent: &chequebookLastChequePeerResponse{
-				Beneficiary: j.Cheque.Beneficiary.String(),
-				Chequebook:  j.Cheque.Chequebook.String(),
-				Payout:      bigint.Wrap(j.Cheque.CumulativePayout),
+				Beneficiary: j.Beneficiary.String(),
+				Chequebook:  j.Chequebook.String(),
+				Payout:      bigint.Wrap(j.CumulativePayout),
 			},
 			LastReceived: nil,
 		}
@@ -190,19 +190,19 @@ func (s *Service) chequebookAllLastHandler(w http.ResponseWriter, _ *http.Reques
 		if _, ok := lcr[i]; ok {
 			t := lcr[i]
 			t.LastReceived = &chequebookLastChequePeerResponse{
-				Beneficiary: j.Cheque.Beneficiary.String(),
-				Chequebook:  j.Cheque.Chequebook.String(),
-				Payout:      bigint.Wrap(j.Cheque.CumulativePayout),
+				Beneficiary: j.Beneficiary.String(),
+				Chequebook:  j.Chequebook.String(),
+				Payout:      bigint.Wrap(j.CumulativePayout),
 			}
 			lcr[i] = t
 		} else {
 			lcr[i] = chequebookLastChequesPeerResponse{
 				Peer:     i,
 				LastSent: nil,
 				LastReceived: &chequebookLastChequePeerResponse{
-					Beneficiary: j.Cheque.Beneficiary.String(),
-					Chequebook:  j.Cheque.Chequebook.String(),
-					Payout:      bigint.Wrap(j.Cheque.CumulativePayout),
+					Beneficiary: j.Beneficiary.String(),
+					Chequebook:  j.Chequebook.String(),
+					Payout:      bigint.Wrap(j.CumulativePayout),
 				},
 			}
 		}

pkg/bmt/proof.go

@@ -20,7 +20,7 @@ type Proof struct {
 // Hash overrides base hash function of Hasher to fill buffer with zeros until chunk length
 func (p Prover) Hash(b []byte) ([]byte, error) {
 	for i := p.size; i < p.maxSize; i += len(zerosection) {
-		_, err := p.Hasher.Write(zerosection)
+		_, err := p.Write(zerosection)
 		if err != nil {
 			return nil, err
 		}