[#1377] oid, cid: Upgrade SDK package

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>

pkg/local_object_storage/blobstor/blobovnicza_test.go

@@ -1,7 +1,6 @@
 package blobstor
 
 import (
-	"crypto/sha256"
 	"math/rand"
 	"os"
 	"testing"
@@ -12,33 +11,15 @@ import (
 	cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test"
 	objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
 	addressSDK "github.com/nspcc-dev/neofs-sdk-go/object/address"
-	oidSDK "github.com/nspcc-dev/neofs-sdk-go/object/id"
+	oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test"
 	"github.com/stretchr/testify/require"
 )
 
-func testSHA256() (h [sha256.Size]byte) {
-	rand.Read(h[:])
-
-	return h
-}
-
-func testAddress() *addressSDK.Address {
-	oid := oidSDK.NewID()
-	oid.SetSHA256(testSHA256())
-
-	addr := addressSDK.NewAddress()
-	addr.SetObjectID(oid)
-	addr.SetContainerID(cidtest.ID())
-
-	return addr
-}
-
 func testObject(sz uint64) *objectSDK.Object {
 	raw := objectSDK.New()
 
-	addr := testAddress()
-	raw.SetID(addr.ObjectID())
-	raw.SetContainerID(addr.ContainerID())
+	raw.SetID(oidtest.ID())
+	raw.SetContainerID(cidtest.ID())
 
 	raw.SetPayload(make([]byte, sz))
 

pkg/local_object_storage/blobstor/exists_test.go

@@ -7,6 +7,7 @@ import (
 
 	objectCore "github.com/nspcc-dev/neofs-node/pkg/core/object"
 	objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
+	objecttest "github.com/nspcc-dev/neofs-sdk-go/object/address/test"
 	"github.com/stretchr/testify/require"
 )
 
@@ -44,7 +45,7 @@ func TestExists(t *testing.T) {
 		require.True(t, res.Exists())
 	}
 
-	prm.SetAddress(testAddress())
+	prm.SetAddress(objecttest.Address())
 	res, err := b.Exists(prm)
 	require.NoError(t, err)
 	require.False(t, res.Exists())

pkg/local_object_storage/blobstor/fstree/fstree.go

@@ -43,7 +43,10 @@ const (
 var ErrFileNotFound = errors.New("file not found")
 
 func stringifyAddress(addr *addressSDK.Address) string {
-	return addr.ObjectID().String() + "." + addr.ContainerID().String()
+	id, _ := addr.ObjectID()
+	cnr, _ := addr.ContainerID()
+
+	return id.EncodeToString() + "." + cnr.EncodeToString()
 }
 
 func addressFromString(s string) (*addressSDK.Address, error) {
@@ -52,13 +55,13 @@ func addressFromString(s string) (*addressSDK.Address, error) {
 		return nil, errors.New("invalid address")
 	}
 
-	oid := oidSDK.NewID()
-	if err := oid.Parse(ss[0]); err != nil {
+	var oid oidSDK.ID
+	if err := oid.DecodeString(ss[0]); err != nil {
 		return nil, err
 	}
 
-	id := cid.New()
-	if err := id.Parse(ss[1]); err != nil {
+	var id cid.ID
+	if err := id.DecodeString(ss[1]); err != nil {
 		return nil, err
 	}
 

pkg/local_object_storage/blobstor/fstree/fstree_test.go

@@ -2,40 +2,19 @@ package fstree
 
 import (
 	"crypto/rand"
-	"crypto/sha256"
 	"errors"
 	"os"
 	"path/filepath"
 	"testing"
 
 	"github.com/nspcc-dev/neofs-node/pkg/util"
-	cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test"
 	addressSDK "github.com/nspcc-dev/neofs-sdk-go/object/address"
 	objecttest "github.com/nspcc-dev/neofs-sdk-go/object/address/test"
-	oidSDK "github.com/nspcc-dev/neofs-sdk-go/object/id"
 	"github.com/stretchr/testify/require"
 )
 
-func testOID() *oidSDK.ID {
-	cs := [sha256.Size]byte{}
-	_, _ = rand.Read(cs[:])
-
-	id := oidSDK.NewID()
-	id.SetSHA256(cs)
-
-	return id
-}
-
-func testAddress() *addressSDK.Address {
-	a := addressSDK.NewAddress()
-	a.SetObjectID(testOID())
-	a.SetContainerID(cidtest.ID())
-
-	return a
-}
-
 func TestAddressToString(t *testing.T) {
-	addr := testAddress()
+	addr := objecttest.Address()
 	s := stringifyAddress(addr)
 	actual, err := addressFromString(s)
 	require.NoError(t, err)
@@ -62,7 +41,7 @@ func TestFSTree(t *testing.T) {
 	store := map[string][]byte{}
 
 	for i := 0; i < count; i++ {
-		a := testAddress()
+		a := objecttest.Address()
 		addrs = append(addrs, a)
 
 		data := make([]byte, 10)
@@ -78,7 +57,7 @@ func TestFSTree(t *testing.T) {
 			require.Equal(t, store[a.String()], actual)
 		}
 
-		_, err := fs.Get(testAddress())
+		_, err := fs.Get(objecttest.Address())
 		require.Error(t, err)
 	})
 
@@ -88,7 +67,7 @@ func TestFSTree(t *testing.T) {
 			require.NoError(t, err)
 		}
 
-		_, err := fs.Exists(testAddress())
+		_, err := fs.Exists(objecttest.Address())
 		require.Error(t, err)
 	})
 
@@ -167,6 +146,6 @@ func TestFSTree(t *testing.T) {
 		_, err = fs.Exists(addrs[1])
 		require.NoError(t, err)
 
-		require.Error(t, fs.Delete(testAddress()))
+		require.Error(t, fs.Delete(objecttest.Address()))
 	})
 }

pkg/local_object_storage/blobstor/iterate_test.go

@@ -117,9 +117,12 @@ func TestIterate_IgnoreErrors(t *testing.T) {
 	addrs := make([]*addressSDK.Address, objCount)
 	for i := range addrs {
 		addrs[i] = objecttest.Address()
+		id, _ := addrs[i].ObjectID()
+		cnr, _ := addrs[i].ContainerID()
+
 		obj := object.New()
-		obj.SetContainerID(addrs[i].ContainerID())
-		obj.SetID(addrs[i].ObjectID())
+		obj.SetContainerID(cnr)
+		obj.SetID(id)
 		obj.SetPayload(make([]byte, smallSize<<(i%2)))
 
 		objData, err := obj.Marshal()
@@ -184,8 +187,10 @@ func TestIterate_IgnoreErrors(t *testing.T) {
 			}
 
 			addr := addressSDK.NewAddress()
-			addr.SetContainerID(obj.ContainerID())
-			addr.SetObjectID(obj.ID())
+			cnr, _ := obj.ContainerID()
+			addr.SetContainerID(cnr)
+			id, _ := obj.ID()
+			addr.SetObjectID(id)
 			actual = append(actual, addr)
 			return nil
 		})