From 468caa83d9b09629247931d2ae8e197be716e4d0 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Wed, 17 Nov 2021 12:45:01 +0300 Subject: [PATCH] [#948] Adopt sdk-go client Signed-off-by: Alex Vanin --- pkg/local_object_storage/engine/list.go | 2 +- pkg/local_object_storage/engine/list_test.go | 6 +++--- pkg/local_object_storage/metabase/list.go | 2 +- pkg/local_object_storage/metabase/list_test.go | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/local_object_storage/engine/list.go b/pkg/local_object_storage/engine/list.go index a89cf6326..8be1c83f8 100644 --- a/pkg/local_object_storage/engine/list.go +++ b/pkg/local_object_storage/engine/list.go @@ -3,9 +3,9 @@ package engine import ( "sort" - "github.com/nspcc-dev/neofs-api-go/pkg/object" core "github.com/nspcc-dev/neofs-node/pkg/core/object" "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" + "github.com/nspcc-dev/neofs-sdk-go/object" ) // Cursor is a type for continuous object listing. diff --git a/pkg/local_object_storage/engine/list_test.go b/pkg/local_object_storage/engine/list_test.go index ecd1918a1..496b5eae3 100644 --- a/pkg/local_object_storage/engine/list_test.go +++ b/pkg/local_object_storage/engine/list_test.go @@ -6,9 +6,9 @@ import ( "sort" "testing" - cidtest "github.com/nspcc-dev/neofs-api-go/pkg/container/id/test" - "github.com/nspcc-dev/neofs-api-go/pkg/object" core "github.com/nspcc-dev/neofs-node/pkg/core/object" + cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" + "github.com/nspcc-dev/neofs-sdk-go/object" "github.com/stretchr/testify/require" ) @@ -28,7 +28,7 @@ func TestListWithCursor(t *testing.T) { got := make([]*object.Address, 0, total) for i := 0; i < total; i++ { - containerID := cidtest.Generate() + containerID := cidtest.GenerateID() obj := generateRawObjectWithCID(t, containerID) prm := new(PutPrm).WithObject(obj.Object()) _, err := e.Put(prm) diff --git a/pkg/local_object_storage/metabase/list.go b/pkg/local_object_storage/metabase/list.go index fd42f78c0..9a5e68504 100644 --- a/pkg/local_object_storage/metabase/list.go +++ b/pkg/local_object_storage/metabase/list.go @@ -1,8 +1,8 @@ package meta import ( - "github.com/nspcc-dev/neofs-api-go/pkg/object" core "github.com/nspcc-dev/neofs-node/pkg/core/object" + "github.com/nspcc-dev/neofs-sdk-go/object" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/list_test.go b/pkg/local_object_storage/metabase/list_test.go index 8f76eb2ca..22292c89e 100644 --- a/pkg/local_object_storage/metabase/list_test.go +++ b/pkg/local_object_storage/metabase/list_test.go @@ -5,10 +5,10 @@ import ( "sort" "testing" - cidtest "github.com/nspcc-dev/neofs-api-go/pkg/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-api-go/pkg/object" core "github.com/nspcc-dev/neofs-node/pkg/core/object" meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" + cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" + objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" "github.com/stretchr/testify/require" ) @@ -24,7 +24,7 @@ func TestLisObjectsWithCursor(t *testing.T) { // fill metabase with objects for i := 0; i < containers; i++ { - containerID := cidtest.Generate() + containerID := cidtest.GenerateID() // add one regular object obj := generateRawObjectWithCID(t, containerID)