realloc/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Releases Packages 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

13
pkg/local_object_storage/blobstor/fstree/fstree.go
View file

@ -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
}

31
pkg/local_object_storage/blobstor/fstree/fstree_test.go
View file

@ -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()))
})
}