chore(linters): add errorlint (celestiaorg#3334)

Adds errorlint linter and fixes related issues

.golangci.yml

@@ -8,6 +8,7 @@ linters:
     - dogsled
     - dupl
     - errcheck
+    - errorlint
     # - funlen
     # - gochecknoglobals
     # - gochecknoinits

api/gateway/availability.go

@@ -2,6 +2,7 @@ package gateway
 
 import (
 	"encoding/json"
+	"errors"
 	"net/http"
 	"strconv"
 
@@ -33,8 +34,8 @@ func (h *Handler) handleHeightAvailabilityRequest(w http.ResponseWriter, r *http
 	}
 
 	err = h.share.SharesAvailable(r.Context(), header)
-	switch err {
-	case nil:
+	switch {
+	case err == nil:
 		resp, err := json.Marshal(&AvailabilityResponse{Available: true})
 		if err != nil {
 			writeError(w, http.StatusInternalServerError, heightAvailabilityEndpoint, err)
@@ -44,7 +45,7 @@ func (h *Handler) handleHeightAvailabilityRequest(w http.ResponseWriter, r *http
 		if werr != nil {
 			log.Errorw("serving request", "endpoint", heightAvailabilityEndpoint, "err", err)
 		}
-	case share.ErrNotAvailable:
+	case errors.Is(err, share.ErrNotAvailable):
 		resp, err := json.Marshal(&AvailabilityResponse{Available: false})
 		if err != nil {
 			writeError(w, http.StatusInternalServerError, heightAvailabilityEndpoint, err)

blob/service.go

@@ -239,9 +239,9 @@ func (s *Service) Included(
 		return blob.compareCommitments(commitment)
 	}}
 	_, resProof, err := s.retrieve(ctx, height, namespace, sharesParser)
-	switch err {
-	case nil:
-	case ErrBlobNotFound:
+	switch {
+	case err == nil:
+	case errors.Is(err, ErrBlobNotFound):
 		return false, nil
 	default:
 		return false, err

cmd/rpc.go

@@ -48,12 +48,12 @@ func InitClient(cmd *cobra.Command, _ []string) error {
 
 		storePath, err := getStorePath(cmd)
 		if err != nil {
-			return fmt.Errorf("%s: %v", rootErrMsg, err)
+			return fmt.Errorf("%s: %w", rootErrMsg, err)
 		}
 
 		cfg, err := nodebuilder.LoadConfig(filepath.Join(storePath, "config.toml"))
 		if err != nil {
-			return fmt.Errorf("%s: root directory was not specified: %v", rootErrMsg, err)
+			return fmt.Errorf("%s: root directory was not specified: %w", rootErrMsg, err)
 		}
 
 		if requestURL == "" {
@@ -66,7 +66,7 @@ func InitClient(cmd *cobra.Command, _ []string) error {
 		} else {
 			token, err := getToken(storePath)
 			if err != nil {
-				return fmt.Errorf("%s: %v", rootErrMsg, err)
+				return fmt.Errorf("%s: %w", rootErrMsg, err)
 			}
 
 			authTokenFlag = token

das/subscriber.go

@@ -2,6 +2,7 @@ package das
 
 import (
 	"context"
+	"errors"
 
 	libhead "github.com/celestiaorg/go-header"
 
@@ -25,7 +26,7 @@ func (s *subscriber) run(ctx context.Context, sub libhead.Subscription[*header.E
 	for {
 		h, err := sub.NextHeader(ctx)
 		if err != nil {
-			if err == context.Canceled {
+			if errors.Is(err, context.Canceled) {
 				return
 			}
 

nodebuilder/blob/cmd/blob.go

@@ -73,17 +73,17 @@ var getCmd = &cobra.Command{
 
 		height, err := strconv.ParseUint(args[0], 10, 64)
 		if err != nil {
-			return fmt.Errorf("error parsing a height:%v", err)
+			return fmt.Errorf("error parsing a height: %w", err)
 		}
 
 		namespace, err := cmdnode.ParseV0Namespace(args[1])
 		if err != nil {
-			return fmt.Errorf("error parsing a namespace:%v", err)
+			return fmt.Errorf("error parsing a namespace: %w", err)
 		}
 
 		commitment, err := base64.StdEncoding.DecodeString(args[2])
 		if err != nil {
-			return fmt.Errorf("error parsing a commitment:%v", err)
+			return fmt.Errorf("error parsing a commitment: %w", err)
 		}
 
 		blob, err := client.Blob.Get(cmd.Context(), height, namespace, commitment)
@@ -109,12 +109,12 @@ var getAllCmd = &cobra.Command{
 
 		height, err := strconv.ParseUint(args[0], 10, 64)
 		if err != nil {
-			return fmt.Errorf("error parsing a height:%v", err)
+			return fmt.Errorf("error parsing a height: %w", err)
 		}
 
 		namespace, err := cmdnode.ParseV0Namespace(args[1])
 		if err != nil {
-			return fmt.Errorf("error parsing a namespace:%v", err)
+			return fmt.Errorf("error parsing a namespace: %w", err)
 		}
 
 		blobs, err := client.Blob.GetAll(cmd.Context(), height, []share.Namespace{namespace})
@@ -224,12 +224,12 @@ var submitCmd = &cobra.Command{
 func getBlobFromArguments(namespaceArg, blobArg string) (*blob.Blob, error) {
 	namespace, err := cmdnode.ParseV0Namespace(namespaceArg)
 	if err != nil {
-		return nil, fmt.Errorf("error parsing a namespace:%v", err)
+		return nil, fmt.Errorf("error parsing a namespace: %w", err)
 	}
 
 	parsedBlob, err := blob.NewBlobV0(namespace, []byte(blobArg))
 	if err != nil {
-		return nil, fmt.Errorf("error creating a blob:%v", err)
+		return nil, fmt.Errorf("error creating a blob: %w", err)
 	}
 
 	return parsedBlob, nil
@@ -248,17 +248,17 @@ var getProofCmd = &cobra.Command{
 
 		height, err := strconv.ParseUint(args[0], 10, 64)
 		if err != nil {
-			return fmt.Errorf("error parsing a height:%v", err)
+			return fmt.Errorf("error parsing a height: %w", err)
 		}
 
 		namespace, err := cmdnode.ParseV0Namespace(args[1])
 		if err != nil {
-			return fmt.Errorf("error parsing a namespace:%v", err)
+			return fmt.Errorf("error parsing a namespace: %w", err)
 		}
 
 		commitment, err := base64.StdEncoding.DecodeString(args[2])
 		if err != nil {
-			return fmt.Errorf("error parsing a commitment:%v", err)
+			return fmt.Errorf("error parsing a commitment: %w", err)
 		}
 
 		proof, err := client.Blob.GetProof(cmd.Context(), height, namespace, commitment)

nodebuilder/header/cmd/header.go

@@ -72,7 +72,7 @@ var getByHashCmd = &cobra.Command{
 
 		hash, err := hex.DecodeString(args[0])
 		if err != nil {
-			return fmt.Errorf("error decoding a hash: expected a hex encoded string:%v", err)
+			return fmt.Errorf("error decoding a hash: expected a hex encoded string: %w", err)
 		}
 		header, err := client.Header.GetByHash(cmd.Context(), hash)
 		return cmdnode.PrintOutput(header, err, nil)
@@ -92,7 +92,7 @@ var getByHeightCmd = &cobra.Command{
 
 		height, err := strconv.ParseUint(args[0], 10, 64)
 		if err != nil {
-			return fmt.Errorf("error parsing a height:%v", err)
+			return fmt.Errorf("error parsing a height: %w", err)
 		}
 
 		header, err := client.Header.GetByHeight(cmd.Context(), height)

nodebuilder/header/service.go

@@ -2,6 +2,7 @@ package header
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	libhead "github.com/celestiaorg/go-header"
@@ -125,7 +126,7 @@ func (s *Service) Subscribe(ctx context.Context) (<-chan *header.ExtendedHeader,
 		for {
 			h, err := subscription.NextHeader(ctx)
 			if err != nil {
-				if err != context.DeadlineExceeded && err != context.Canceled {
+				if !errors.Is(err, context.DeadlineExceeded) && !errors.Is(err, context.Canceled) {
 					log.Errorw("fetching header from subscription", "err", err)
 				}
 				return

nodebuilder/p2p/addrs.go

@@ -15,7 +15,7 @@ func Listen(listen []string) func(h hst.Host) (err error) {
 		for i, addr := range listen {
 			maListen[i], err = ma.NewMultiaddr(addr)
 			if err != nil {
-				return fmt.Errorf("failure to parse config.P2P.ListenAddresses: %s", err)
+				return fmt.Errorf("failure to parse config.P2P.ListenAddresses: %w", err)
 			}
 		}
 		return h.Network().Listen(maListen...)
@@ -30,7 +30,7 @@ func addrsFactory(announce, noAnnounce []string) func() (_ p2pconfig.AddrsFactor
 		for i, addr := range announce {
 			maAnnounce[i], err = ma.NewMultiaddr(addr)
 			if err != nil {
-				return nil, fmt.Errorf("failure to parse config.P2P.AnnounceAddresses: %s", err)
+				return nil, fmt.Errorf("failure to parse config.P2P.AnnounceAddresses: %w", err)
 			}
 		}
 
@@ -40,7 +40,7 @@ func addrsFactory(announce, noAnnounce []string) func() (_ p2pconfig.AddrsFactor
 		for _, addr := range noAnnounce {
 			maddr, err := ma.NewMultiaddr(addr)
 			if err != nil {
-				return nil, fmt.Errorf("failure to parse config.P2P.NoAnnounceAddresses: %s", err)
+				return nil, fmt.Errorf("failure to parse config.P2P.NoAnnounceAddresses: %w", err)
 			}
 			maNoAnnounce[string(maddr.Bytes())] = true
 		}

nodebuilder/p2p/config.go

@@ -71,7 +71,7 @@ func (cfg *Config) mutualPeers() (_ []peer.AddrInfo, err error) {
 	for i, addr := range cfg.MutualPeers {
 		maddrs[i], err = ma.NewMultiaddr(addr)
 		if err != nil {
-			return nil, fmt.Errorf("failure to parse config.P2P.MutualPeers: %s", err)
+			return nil, fmt.Errorf("failure to parse config.P2P.MutualPeers: %w", err)
 		}
 	}