[#1214] *: Use single Object type in whole project

Remove `Object` and `RawObject` types from `pkg/core/object` package.
Use `Object` type from NeoFS SDK Go library everywhere. Avoid using the
deprecated elements.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2022-03-03 17:19:05 +03:00 committed by Alex Vanin
parent 19ad349b27
commit 7ccd1625af
100 changed files with 847 additions and 965 deletions

View file

@ -4,6 +4,7 @@ import (
"errors"
"testing"
"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"
@ -14,58 +15,58 @@ func TestDB_Exists(t *testing.T) {
db := newDB(t)
t.Run("no object", func(t *testing.T) {
nonExist := generateRawObject(t)
exists, err := meta.Exists(db, nonExist.Object().Address())
nonExist := generateObject(t)
exists, err := meta.Exists(db, object.AddressOf(nonExist))
require.NoError(t, err)
require.False(t, exists)
})
t.Run("regular object", func(t *testing.T) {
regular := generateRawObject(t)
err := putBig(db, regular.Object())
regular := generateObject(t)
err := putBig(db, regular)
require.NoError(t, err)
exists, err := meta.Exists(db, regular.Object().Address())
exists, err := meta.Exists(db, object.AddressOf(regular))
require.NoError(t, err)
require.True(t, exists)
})
t.Run("tombstone object", func(t *testing.T) {
ts := generateRawObject(t)
ts := generateObject(t)
ts.SetType(objectSDK.TypeTombstone)
err := putBig(db, ts.Object())
err := putBig(db, ts)
require.NoError(t, err)
exists, err := meta.Exists(db, ts.Object().Address())
exists, err := meta.Exists(db, object.AddressOf(ts))
require.NoError(t, err)
require.True(t, exists)
})
t.Run("storage group object", func(t *testing.T) {
sg := generateRawObject(t)
sg := generateObject(t)
sg.SetType(objectSDK.TypeStorageGroup)
err := putBig(db, sg.Object())
err := putBig(db, sg)
require.NoError(t, err)
exists, err := meta.Exists(db, sg.Object().Address())
exists, err := meta.Exists(db, object.AddressOf(sg))
require.NoError(t, err)
require.True(t, exists)
})
t.Run("virtual object", func(t *testing.T) {
cid := cidtest.ID()
parent := generateRawObjectWithCID(t, cid)
parent := generateObjectWithCID(t, cid)
child := generateRawObjectWithCID(t, cid)
child.SetParent(parent.Object().SDK())
child := generateObjectWithCID(t, cid)
child.SetParent(parent)
child.SetParentID(parent.ID())
err := putBig(db, child.Object())
err := putBig(db, child)
require.NoError(t, err)
_, err = meta.Exists(db, parent.Object().Address())
_, err = meta.Exists(db, object.AddressOf(parent))
var expectedErr *objectSDK.SplitInfoError
require.True(t, errors.As(err, &expectedErr))
@ -75,28 +76,28 @@ func TestDB_Exists(t *testing.T) {
cid := cidtest.ID()
splitID := objectSDK.NewSplitID()
parent := generateRawObjectWithCID(t, cid)
parent := generateObjectWithCID(t, cid)
addAttribute(parent, "foo", "bar")
child := generateRawObjectWithCID(t, cid)
child.SetParent(parent.Object().SDK())
child := generateObjectWithCID(t, cid)
child.SetParent(parent)
child.SetParentID(parent.ID())
child.SetSplitID(splitID)
link := generateRawObjectWithCID(t, cid)
link.SetParent(parent.Object().SDK())
link := generateObjectWithCID(t, cid)
link.SetParent(parent)
link.SetParentID(parent.ID())
link.SetChildren(child.ID())
link.SetSplitID(splitID)
t.Run("direct order", func(t *testing.T) {
err := putBig(db, child.Object())
err := putBig(db, child)
require.NoError(t, err)
err = putBig(db, link.Object())
err = putBig(db, link)
require.NoError(t, err)
_, err = meta.Exists(db, parent.Object().Address())
_, err = meta.Exists(db, object.AddressOf(parent))
require.Error(t, err)
si, ok := err.(*objectSDK.SplitInfoError)
@ -108,13 +109,13 @@ func TestDB_Exists(t *testing.T) {
})
t.Run("reverse order", func(t *testing.T) {
err := meta.Put(db, link.Object(), nil)
err := meta.Put(db, link, nil)
require.NoError(t, err)
err = putBig(db, child.Object())
err = putBig(db, child)
require.NoError(t, err)
_, err = meta.Exists(db, parent.Object().Address())
_, err = meta.Exists(db, object.AddressOf(parent))
require.Error(t, err)
si, ok := err.(*objectSDK.SplitInfoError)