[#521] *: use stdlib errors package

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2021-05-18 11:12:51 +03:00 committed by Alex Vanin
parent 43e575cec2
commit 71b87155ef
171 changed files with 825 additions and 674 deletions

View file

@ -1,10 +1,11 @@
package placement
import (
"fmt"
netmapSDK "github.com/nspcc-dev/neofs-api-go/pkg/netmap"
"github.com/nspcc-dev/neofs-api-go/pkg/object"
"github.com/nspcc-dev/neofs-node/pkg/core/netmap"
"github.com/pkg/errors"
)
type netMapBuilder struct {
@ -36,12 +37,12 @@ func (s *netMapSrc) GetNetMap(diff uint64) (*netmapSDK.Netmap, error) {
func (b *netMapBuilder) BuildPlacement(a *object.Address, p *netmapSDK.PlacementPolicy) ([]netmapSDK.Nodes, error) {
nm, err := netmap.GetLatestNetworkMap(b.nmSrc)
if err != nil {
return nil, errors.Wrap(err, "could not get network map")
return nil, fmt.Errorf("could not get network map: %w", err)
}
cn, err := nm.GetContainerNodes(p, a.ContainerID().ToV2().GetValue())
if err != nil {
return nil, errors.Wrap(err, "could not get container nodes")
return nil, fmt.Errorf("could not get container nodes: %w", err)
}
return BuildObjectPlacement(nm, cn, a.ObjectID())
@ -55,7 +56,7 @@ func BuildObjectPlacement(nm *netmapSDK.Netmap, cnrNodes netmapSDK.ContainerNode
on, err := nm.GetPlacementVectors(cnrNodes, objectID.GetValue())
if err != nil {
return nil, errors.Wrap(err, "could not get placement vectors for object")
return nil, fmt.Errorf("could not get placement vectors for object: %w", err)
}
return on, nil

View file

@ -1,13 +1,14 @@
package placement
import (
"errors"
"fmt"
"sync"
"github.com/nspcc-dev/neofs-api-go/pkg/container"
"github.com/nspcc-dev/neofs-api-go/pkg/netmap"
"github.com/nspcc-dev/neofs-api-go/pkg/object"
"github.com/nspcc-dev/neofs-node/pkg/network"
"github.com/pkg/errors"
)
// Builder is an interface of the
@ -70,14 +71,14 @@ func NewTraverser(opts ...Option) (*Traverser, error) {
}
if cfg.builder == nil {
return nil, errors.Wrap(errNilBuilder, invalidOptsMsg)
return nil, fmt.Errorf("%s: %w", invalidOptsMsg, errNilBuilder)
} else if cfg.policy == nil {
return nil, errors.Wrap(errNilPolicy, invalidOptsMsg)
return nil, fmt.Errorf("%s: %w", invalidOptsMsg, errNilPolicy)
}
ns, err := cfg.builder.BuildPlacement(cfg.addr, cfg.policy)
if err != nil {
return nil, errors.Wrap(err, "could not build placement")
return nil, fmt.Errorf("could not build placement: %w", err)
}
var rem []int

View file

@ -2,13 +2,13 @@ package transformer
import (
"crypto/ecdsa"
"fmt"
"github.com/nspcc-dev/neofs-api-go/pkg"
objectSDK "github.com/nspcc-dev/neofs-api-go/pkg/object"
"github.com/nspcc-dev/neofs-api-go/pkg/token"
"github.com/nspcc-dev/neofs-node/pkg/core/netmap"
"github.com/nspcc-dev/neofs-node/pkg/core/object"
"github.com/pkg/errors"
)
type formatter struct {
@ -81,7 +81,7 @@ func (f *formatter) Close() (*AccessIdentifiers, error) {
rawPar.SetCreationEpoch(curEpoch)
if err := objectSDK.SetIDWithSignature(f.prm.Key, rawPar); err != nil {
return nil, errors.Wrap(err, "could not finalize parent object")
return nil, fmt.Errorf("could not finalize parent object: %w", err)
}
parID = rawPar.ID()
@ -91,15 +91,15 @@ func (f *formatter) Close() (*AccessIdentifiers, error) {
}
if err := objectSDK.SetIDWithSignature(f.prm.Key, f.obj.SDK()); err != nil {
return nil, errors.Wrap(err, "could not finalize object")
return nil, fmt.Errorf("could not finalize object: %w", err)
}
if err := f.prm.NextTarget.WriteHeader(f.obj); err != nil {
return nil, errors.Wrap(err, "could not write header to next target")
return nil, fmt.Errorf("could not write header to next target: %w", err)
}
if _, err := f.prm.NextTarget.Close(); err != nil {
return nil, errors.Wrap(err, "could not close next target")
return nil, fmt.Errorf("could not close next target: %w", err)
}
return new(AccessIdentifiers).

View file

@ -10,7 +10,6 @@ import (
objectSDK "github.com/nspcc-dev/neofs-api-go/pkg/object"
"github.com/nspcc-dev/neofs-node/pkg/core/object"
"github.com/nspcc-dev/tzhash/tz"
"github.com/pkg/errors"
)
type payloadSizeLimiter struct {
@ -183,12 +182,12 @@ func (s *payloadSizeLimiter) release(close bool) (*AccessIdentifiers, error) {
// release current, get its id
if err := s.target.WriteHeader(s.current); err != nil {
return nil, errors.Wrap(err, "could not write header")
return nil, fmt.Errorf("could not write header: %w", err)
}
ids, err := s.target.Close()
if err != nil {
return nil, errors.Wrap(err, "could not close target")
return nil, fmt.Errorf("could not close target: %w", err)
}
// save identifier of the released object
@ -200,7 +199,7 @@ func (s *payloadSizeLimiter) release(close bool) (*AccessIdentifiers, error) {
s.initializeCurrent()
if _, err := s.release(false); err != nil {
return nil, errors.Wrap(err, "could not release linking object")
return nil, fmt.Errorf("could not release linking object: %w", err)
}
}
@ -229,7 +228,7 @@ func (s *payloadSizeLimiter) writeChunk(chunk []byte) error {
// we need to release current object
if _, err := s.release(false); err != nil {
return errors.Wrap(err, "could not release object")
return fmt.Errorf("could not release object: %w", err)
}
// initialize another object
@ -248,7 +247,7 @@ func (s *payloadSizeLimiter) writeChunk(chunk []byte) error {
}
if _, err := s.chunkWriter.Write(chunk[:cut]); err != nil {
return errors.Wrap(err, "could not write chunk to target")
return fmt.Errorf("could not write chunk to target: %w", err)
}
// increase written bytes counter