george.bartolomey/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#1377] oid, cid: Upgrade SDK package

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2022-05-12 19:37:46 +03:00 • committed by LeL
parent f65898a354
commit f15e6e888f
118 changed files with 1455 additions and 886 deletions
Download patch file Download diff file Expand all files Collapse all files

31
pkg/local_object_storage/metabase/db_test.go
View file

@ -2,7 +2,6 @@ package meta_test
import (
"crypto/sha256"
"math/rand"
"os"
"testing"
@ -13,7 +12,7 @@ import (
cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test"
"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/nspcc-dev/neofs-sdk-go/owner"
ownertest "github.com/nspcc-dev/neofs-sdk-go/owner/test"
"github.com/nspcc-dev/neofs-sdk-go/version"
@ -26,8 +25,8 @@ func putBig(db *meta.DB, obj *object.Object) error {
return meta.Put(db, obj, nil)
}
func testSelect(t *testing.T, db *meta.DB, cid *cid.ID, fs object.SearchFilters, exp ...*addressSDK.Address) {
res, err := meta.Select(db, cid, fs)
func testSelect(t *testing.T, db *meta.DB, cnr cid.ID, fs object.SearchFilters, exp ...*addressSDK.Address) {
res, err := meta.Select(db, &cnr, fs)
require.NoError(t, err)
require.Len(t, res, len(exp))
@ -36,16 +35,6 @@ func testSelect(t *testing.T, db *meta.DB, cid *cid.ID, fs object.SearchFilters,
}
}
func testOID() *oidSDK.ID {
cs := [sha256.Size]byte{}
_, _ = rand.Read(cs[:])
id := oidSDK.NewID()
id.SetSHA256(cs)
return id
}
func newDB(t testing.TB, opts ...meta.Option) *meta.DB {
path := t.Name()
@ -67,7 +56,7 @@ func generateObject(t testing.TB) *object.Object {
return generateObjectWithCID(t, cidtest.ID())
}
func generateObjectWithCID(t testing.TB, cid *cid.ID) *object.Object {
func generateObjectWithCID(t testing.TB, cnr cid.ID) *object.Object {
var ver version.Version
ver.SetMajor(2)
ver.SetMinor(1)
@ -79,9 +68,9 @@ func generateObjectWithCID(t testing.TB, cid *cid.ID) *object.Object {
csumTZ.SetTillichZemor(tz.Sum(csum.Value()))
obj := object.New()
obj.SetID(testOID())
obj.SetID(oidtest.ID())
obj.SetOwnerID(ownertest.ID())
obj.SetContainerID(cid)
obj.SetContainerID(cnr)
obj.SetVersion(&ver)
obj.SetPayloadChecksum(csum)
obj.SetPayloadHomomorphicHash(csumTZ)
@ -90,14 +79,6 @@ func generateObjectWithCID(t testing.TB, cid *cid.ID) *object.Object {
return obj
}
func generateAddress() *addressSDK.Address {
addr := addressSDK.NewAddress()
addr.SetContainerID(cidtest.ID())
addr.SetObjectID(testOID())
return addr
}
func addAttribute(obj *object.Object, key, val string) {
var attr object.Attribute
attr.SetKey(key)