Skip to content

Commit

Permalink
chore: use errors.New to replace fmt.Errorf with no parameters (#10617)
Browse files Browse the repository at this point in the history
  • Loading branch information
ChengenH authored Dec 10, 2024
1 parent 19dc712 commit 642e58e
Show file tree
Hide file tree
Showing 20 changed files with 37 additions and 32 deletions.
4 changes: 2 additions & 2 deletions cmd/ipfs/kubo/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment
if !domigrate {
fmt.Println("Not running migrations of fs-repo now.")
fmt.Println("Please get fs-repo-migrations from https://dist.ipfs.tech")
return fmt.Errorf("fs-repo requires migration")
return errors.New("fs-repo requires migration")
}

// Read Migration section of IPFS config
Expand Down Expand Up @@ -436,7 +436,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment
ncfg.Routing = libp2p.NilRouterOption
case routingOptionCustomKwd:
if cfg.Routing.AcceleratedDHTClient.WithDefault(config.DefaultAcceleratedDHTClient) {
return fmt.Errorf("Routing.AcceleratedDHTClient option is set even tho Routing.Type is custom, using custom .AcceleratedDHTClient needs to be set on DHT routers individually")
return errors.New("Routing.AcceleratedDHTClient option is set even tho Routing.Type is custom, using custom .AcceleratedDHTClient needs to be set on DHT routers individually")
}
ncfg.Routing = libp2p.ConstructDelegatedRouting(
cfg.Routing.Routers,
Expand Down
4 changes: 2 additions & 2 deletions cmd/ipfs/kubo/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ environment variable:
if it.Err() != nil {
return it.Err()
}
return fmt.Errorf("file argument was nil")
return errors.New("file argument was nil")
}
file := files.FileFromEntry(it)
if file == nil {
return fmt.Errorf("expected a regular file")
return errors.New("expected a regular file")
}

conf = &config.Config{}
Expand Down
2 changes: 1 addition & 1 deletion core/commands/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
)

// ErrDepthLimitExceeded indicates that the max depth has been exceeded.
var ErrDepthLimitExceeded = fmt.Errorf("depth limit exceeded")
var ErrDepthLimitExceeded = errors.New("depth limit exceeded")

type TimeParts struct {
t *time.Time
Expand Down
6 changes: 3 additions & 3 deletions core/commands/cat.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package commands

import (
"context"
"fmt"
"errors"
"io"
"os"

Expand Down Expand Up @@ -43,13 +43,13 @@ var CatCmd = &cmds.Command{

offset, _ := req.Options[offsetOptionName].(int64)
if offset < 0 {
return fmt.Errorf("cannot specify negative offset")
return errors.New("cannot specify negative offset")
}

max, found := req.Options[lengthOptionName].(int64)

if max < 0 {
return fmt.Errorf("cannot specify negative length")
return errors.New("cannot specify negative length")
}
if !found {
max = -1
Expand Down
5 changes: 3 additions & 2 deletions core/commands/cid.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package commands

import (
"errors"
"fmt"
"io"
"sort"
Expand Down Expand Up @@ -85,10 +86,10 @@ The optional format string is a printf style format string:
}
case "0":
if opts.newCodec != 0 && opts.newCodec != cid.DagProtobuf {
return fmt.Errorf("cannot convert to CIDv0 with any codec other than dag-pb")
return errors.New("cannot convert to CIDv0 with any codec other than dag-pb")
}
if baseStr != "" && baseStr != "base58btc" {
return fmt.Errorf("cannot convert to CIDv0 with any multibase other than the implicit base58btc")
return errors.New("cannot convert to CIDv0 with any multibase other than the implicit base58btc")
}
opts.verConv = toCidV0
case "1":
Expand Down
2 changes: 1 addition & 1 deletion core/commands/dht.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ var queryDhtCmd = &cmds.Command{
}

if d, ok := client.(kademlia); !ok {
return fmt.Errorf("dht client does not support GetClosestPeers")
return errors.New("dht client does not support GetClosestPeers")
} else {
errCh := make(chan error, 1)
go func() {
Expand Down
2 changes: 1 addition & 1 deletion core/commands/files.go
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ func statNode(nd ipld.Node, enc cidenc.Encoder) (*statOutput, error) {
Type: "file",
}, nil
default:
return nil, fmt.Errorf("not unixfs node (proto or raw)")
return nil, errors.New("not unixfs node (proto or raw)")
}
}

Expand Down
2 changes: 1 addition & 1 deletion core/commands/id.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ EXAMPLE:
var err error
id, err = peer.Decode(req.Arguments[0])
if err != nil {
return fmt.Errorf("invalid peer id")
return errors.New("invalid peer id")
}
} else {
id = n.Identity
Expand Down
5 changes: 3 additions & 2 deletions core/commands/keystore.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"crypto/ed25519"
"crypto/x509"
"encoding/pem"
"errors"
"fmt"
"io"
"os"
Expand Down Expand Up @@ -101,12 +102,12 @@ var keyGenCmd = &cmds.Command{

typ, f := req.Options[keyStoreTypeOptionName].(string)
if !f {
return fmt.Errorf("please specify a key type with --type")
return errors.New("please specify a key type with --type")
}

name := req.Arguments[0]
if name == "self" {
return fmt.Errorf("cannot create key with name 'self'")
return errors.New("cannot create key with name 'self'")
}

opts := []options.KeyGenerateOption{options.Key.Type(typ)}
Expand Down
4 changes: 2 additions & 2 deletions core/commands/p2p.go
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ func checkPort(target ma.Multiaddr) error {
if sport != "" {
return sport, nil
}
return "", fmt.Errorf("address does not contain tcp or udp protocol")
return "", errors.New("address does not contain tcp or udp protocol")
}

sport, err := getPort()
Expand All @@ -264,7 +264,7 @@ func checkPort(target ma.Multiaddr) error {
}

if port == 0 {
return fmt.Errorf("port can not be 0")
return errors.New("port can not be 0")
}

return nil
Expand Down
2 changes: 1 addition & 1 deletion core/commands/routing.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ var findProvidersRoutingCmd = &cmds.Command{

numProviders, _ := req.Options[numProvidersOptionName].(int)
if numProviders < 1 {
return fmt.Errorf("number of providers must be greater than 0")
return errors.New("number of providers must be greater than 0")
}

c, err := cid.Parse(req.Arguments[0])
Expand Down
3 changes: 2 additions & 1 deletion core/commands/stat.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package commands

import (
"errors"
"fmt"
"io"
"os"
Expand Down Expand Up @@ -100,7 +101,7 @@ Example:
}

if nd.Reporter == nil {
return fmt.Errorf("bandwidth reporter disabled in config")
return errors.New("bandwidth reporter disabled in config")
}

pstr, pfound := req.Options[statPeerOptionName].(string)
Expand Down
2 changes: 1 addition & 1 deletion core/coreapi/coreapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ func (api *CoreAPI) WithOptions(opts ...options.ApiOption) (coreiface.CoreAPI, e
cs = node.DefaultIpnsCacheSize
}
if cs < 0 {
return nil, fmt.Errorf("cannot specify negative resolve cache size")
return nil, errors.New("cannot specify negative resolve cache size")
}

nsOptions := []namesys.Option{
Expand Down
8 changes: 4 additions & 4 deletions core/coreapi/key.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func (api *KeyAPI) Generate(ctx context.Context, name string, opts ...caopts.Key
}

if name == "self" {
return nil, fmt.Errorf("cannot create key with name 'self'")
return nil, errors.New("cannot create key with name 'self'")
}

_, err = api.repo.Keystore().Get(name)
Expand Down Expand Up @@ -168,11 +168,11 @@ func (api *KeyAPI) Rename(ctx context.Context, oldName string, newName string, o
ks := api.repo.Keystore()

if oldName == "self" {
return nil, false, fmt.Errorf("cannot rename key with name 'self'")
return nil, false, errors.New("cannot rename key with name 'self'")
}

if newName == "self" {
return nil, false, fmt.Errorf("cannot overwrite key with name 'self'")
return nil, false, errors.New("cannot overwrite key with name 'self'")
}

oldKey, err := ks.Get(oldName)
Expand Down Expand Up @@ -232,7 +232,7 @@ func (api *KeyAPI) Remove(ctx context.Context, name string) (coreiface.Key, erro
ks := api.repo.Keystore()

if name == "self" {
return nil, fmt.Errorf("cannot remove key with name 'self'")
return nil, errors.New("cannot remove key with name 'self'")
}

removed, err := ks.Get(name)
Expand Down
3 changes: 2 additions & 1 deletion core/coreapi/name.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package coreapi

import (
"context"
"errors"
"fmt"
"strings"
"time"
Expand Down Expand Up @@ -214,5 +215,5 @@ func keylookup(self ci.PrivKey, kstore keystore.Keystore, k string) (ci.PrivKey,
}
}

return nil, fmt.Errorf("no key by the given name or PeerID was found")
return nil, errors.New("no key by the given name or PeerID was found")
}
2 changes: 1 addition & 1 deletion core/coreapi/routing.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func (api *RoutingAPI) FindProviders(ctx context.Context, p path.Path, opts ...c

numProviders := settings.NumProviders
if numProviders < 1 {
return nil, fmt.Errorf("number of providers must be greater than 0")
return nil, errors.New("number of providers must be greater than 0")
}

pchan := api.routing.FindProvidersAsync(ctx, rp.RootCid(), numProviders)
Expand Down
2 changes: 1 addition & 1 deletion core/coreapi/unixfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
//}

if settings.NoCopy && !(cfg.Experimental.FilestoreEnabled || cfg.Experimental.UrlstoreEnabled) {
return path.ImmutablePath{}, fmt.Errorf("either the filestore or the urlstore must be enabled to use nocopy, see: https://github.com/ipfs/kubo/blob/master/docs/experimental-features.md#ipfs-filestore")
return path.ImmutablePath{}, errors.New("either the filestore or the urlstore must be enabled to use nocopy, see: https://github.com/ipfs/kubo/blob/master/docs/experimental-features.md#ipfs-filestore")
}

addblockstore := api.blockstore
Expand Down
2 changes: 1 addition & 1 deletion core/node/groups.go
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ func Online(bcfg *BuildCfg, cfg *config.Config, userResourceOverrides rcmgr.Part
ipnsCacheSize = DefaultIpnsCacheSize
}
if ipnsCacheSize < 0 {
return fx.Error(fmt.Errorf("cannot specify negative resolve cache size"))
return fx.Error(errors.New("cannot specify negative resolve cache size"))
}

// Republisher params
Expand Down
3 changes: 2 additions & 1 deletion core/node/libp2p/rcmgr.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package libp2p
import (
"context"
"encoding/json"
"errors"
"fmt"
"os"
"path/filepath"
Expand All @@ -26,7 +27,7 @@ var rcmgrLogger = logging.Logger("rcmgr")

const NetLimitTraceFilename = "rcmgr.json.gz"

var ErrNoResourceMgr = fmt.Errorf("missing ResourceMgr: make sure the daemon is running with Swarm.ResourceMgr.Enabled")
var ErrNoResourceMgr = errors.New("missing ResourceMgr: make sure the daemon is running with Swarm.ResourceMgr.Enabled")

func ResourceManager(repoPath string, cfg config.SwarmConfig, userResourceOverrides rcmgr.PartialLimitConfig) interface{} {
return func(mctx helpers.MetricsCtx, lc fx.Lifecycle, repo repo.Repo) (network.ResourceManager, Libp2pOpts, error) {
Expand Down
6 changes: 3 additions & 3 deletions core/node/libp2p/smux.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package libp2p

import (
"fmt"
"errors"
"os"

"github.com/ipfs/kubo/config"
Expand All @@ -12,10 +12,10 @@ import (

func makeSmuxTransportOption(tptConfig config.Transports) (libp2p.Option, error) {
if prefs := os.Getenv("LIBP2P_MUX_PREFS"); prefs != "" {
return nil, fmt.Errorf("configuring muxers with LIBP2P_MUX_PREFS is no longer supported, use Swarm.Transports.Multiplexers")
return nil, errors.New("configuring muxers with LIBP2P_MUX_PREFS is no longer supported, use Swarm.Transports.Multiplexers")
}
if tptConfig.Multiplexers.Yamux < 0 {
return nil, fmt.Errorf("running libp2p with Swarm.Transports.Multiplexers.Yamux disabled is not supported")
return nil, errors.New("running libp2p with Swarm.Transports.Multiplexers.Yamux disabled is not supported")
}

return libp2p.Muxer(yamux.ID, yamux.DefaultTransport), nil
Expand Down

0 comments on commit 642e58e

Please sign in to comment.