TrueCloudLab/frostfs-node
21
1
Fork 27
Code Issues 107 Pull requests 3 Projects Releases 2 Activity Actions

[#186] object/acl: Use new storage engine for work

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2020-11-19 11:38:50 +03:00 committed by Alex Vanin
parent 046206f670
commit 953387a1e5
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/services/object/acl/acl.go
View file

@ -17,7 +17,7 @@ import (
crypto "github.com/nspcc-dev/neofs-crypto" crypto "github.com/nspcc-dev/neofs-crypto"
core "github.com/nspcc-dev/neofs-node/pkg/core/container" core "github.com/nspcc-dev/neofs-node/pkg/core/container"
"github.com/nspcc-dev/neofs-node/pkg/core/netmap" "github.com/nspcc-dev/neofs-node/pkg/core/netmap"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/localstore" "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine"
"github.com/nspcc-dev/neofs-node/pkg/services/object/acl/eacl" "github.com/nspcc-dev/neofs-node/pkg/services/object/acl/eacl"
eaclV2 "github.com/nspcc-dev/neofs-node/pkg/services/object/acl/eacl/v2" eaclV2 "github.com/nspcc-dev/neofs-node/pkg/services/object/acl/eacl/v2"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -84,7 +84,7 @@ type eACLCfg struct {
eACL *eacl.Validator eACL *eacl.Validator
localStorage *localstore.Storage localStorage *engine.StorageEngine
state netmap.State state netmap.State
} }

6
pkg/services/object/acl/eacl/v2/localstore.go
View file

@ -5,11 +5,11 @@ import (
objectSDK "github.com/nspcc-dev/neofs-api-go/pkg/object" objectSDK "github.com/nspcc-dev/neofs-api-go/pkg/object"
"github.com/nspcc-dev/neofs-node/pkg/core/object" "github.com/nspcc-dev/neofs-node/pkg/core/object"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/localstore" "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine"
) )
type localStorage struct { type localStorage struct {
ls *localstore.Storage ls *engine.StorageEngine
} }
func (s *localStorage) Head(addr *objectSDK.Address) (*object.Object, error) { func (s *localStorage) Head(addr *objectSDK.Address) (*object.Object, error) {
@ -17,5 +17,5 @@ func (s *localStorage) Head(addr *objectSDK.Address) (*object.Object, error) {
return nil, io.ErrUnexpectedEOF return nil, io.ErrUnexpectedEOF
} }
return s.ls.Head(addr) return engine.Head(s.ls, addr)
} }

4
pkg/services/object/acl/eacl/v2/opts.go
View file

@ -1,7 +1,7 @@
package v2 package v2
import ( import (
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/localstore" "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine"
) )
func WithObjectStorage(v ObjectStorage) Option { func WithObjectStorage(v ObjectStorage) Option {
@ -10,7 +10,7 @@ func WithObjectStorage(v ObjectStorage) Option {
} }
} }
func WithLocalObjectStorage(v *localstore.Storage) Option { func WithLocalObjectStorage(v *engine.StorageEngine) Option {
return func(c *cfg) { return func(c *cfg) {
c.storage = &localStorage{ c.storage = &localStorage{
ls: v, ls: v,

4
pkg/services/object/acl/opts.go
View file

@ -4,7 +4,7 @@ import (
"github.com/nspcc-dev/neofs-api-go/v2/object" "github.com/nspcc-dev/neofs-api-go/v2/object"
"github.com/nspcc-dev/neofs-node/pkg/core/container" "github.com/nspcc-dev/neofs-node/pkg/core/container"
"github.com/nspcc-dev/neofs-node/pkg/core/netmap" "github.com/nspcc-dev/neofs-node/pkg/core/netmap"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/localstore" "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine"
"github.com/nspcc-dev/neofs-node/pkg/services/object/acl/eacl" "github.com/nspcc-dev/neofs-node/pkg/services/object/acl/eacl"
) )
@ -37,7 +37,7 @@ func WithEACLValidatorOptions(v ...eacl.Option) Option {
} }
// WithLocalStorage returns options to set local object storage. // WithLocalStorage returns options to set local object storage.
func WithLocalStorage(v *localstore.Storage) Option { func WithLocalStorage(v *engine.StorageEngine) Option {
return func(c *cfg) { return func(c *cfg) {
c.localStorage = v c.localStorage = v
} }