forked from TrueCloudLab/frostfs-node
[#1115] morph/client: reuse errors from container contract
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
parent
f9d3111825
commit
4caa330ddc
3 changed files with 3 additions and 8 deletions
1
go.mod
1
go.mod
|
@ -15,6 +15,7 @@ require (
|
|||
github.com/nspcc-dev/hrw v1.0.9
|
||||
github.com/nspcc-dev/neo-go v0.98.0
|
||||
github.com/nspcc-dev/neofs-api-go/v2 v2.11.2-0.20220127135316-32dd0bb3f9c5
|
||||
github.com/nspcc-dev/neofs-contract v0.14.2
|
||||
github.com/nspcc-dev/neofs-sdk-go v0.0.0-20220201141054-6a7ba33b59ef
|
||||
github.com/nspcc-dev/tzhash v1.5.1
|
||||
github.com/panjf2000/ants/v2 v2.4.0
|
||||
|
|
BIN
go.sum
BIN
go.sum
Binary file not shown.
|
@ -4,6 +4,7 @@ import (
|
|||
"fmt"
|
||||
"strings"
|
||||
|
||||
containerContract "github.com/nspcc-dev/neofs-contract/container"
|
||||
core "github.com/nspcc-dev/neofs-node/pkg/core/container"
|
||||
"github.com/nspcc-dev/neofs-node/pkg/morph/client"
|
||||
"github.com/nspcc-dev/neofs-sdk-go/container"
|
||||
|
@ -43,14 +44,7 @@ func (c *Client) Get(cid []byte) (*container.Container, error) {
|
|||
|
||||
res, err := c.client.TestInvoke(prm)
|
||||
if err != nil {
|
||||
// TODO(fyrchik): reuse messages from container contract.
|
||||
// Currently there are some dependency problems:
|
||||
// github.com/nspcc-dev/neofs-node/pkg/innerring imports
|
||||
// github.com/nspcc-dev/neofs-sdk-go/audit imports
|
||||
// github.com/nspcc-dev/neofs-api-go/v2/audit: ambiguous import: found package github.com/nspcc-dev/neofs-api-go/v2/audit in multiple modules:
|
||||
// github.com/nspcc-dev/neofs-api-go v1.27.1 (/home/dzeta/go/pkg/mod/github.com/nspcc-dev/neofs-api-go@v1.27.1/v2/audit)
|
||||
// github.com/nspcc-dev/neofs-api-go/v2 v2.11.0-pre.0.20211201134523-3604d96f3fe1 (/home/dzeta/go/pkg/mod/github.com/nspcc-dev/neofs-api-go/v2@v2.11.0-pre.0.20211201134523-3604d96f3fe1/audit)
|
||||
if strings.Contains(err.Error(), "container does not exist") {
|
||||
if strings.Contains(err.Error(), containerContract.NotFoundError) {
|
||||
return nil, core.ErrNotFound
|
||||
}
|
||||
return nil, fmt.Errorf("could not perform test invocation (%s): %w", getMethod, err)
|
||||
|
|
Loading…
Reference in a new issue