From 953387a1e5df9e7db6146210fd521851d83199b0 Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Thu, 19 Nov 2020 11:38:50 +0300 Subject: [PATCH] [#186] object/acl: Use new storage engine for work Signed-off-by: Leonard Lyubich --- pkg/services/object/acl/acl.go | 4 ++-- pkg/services/object/acl/eacl/v2/localstore.go | 6 +++--- pkg/services/object/acl/eacl/v2/opts.go | 4 ++-- pkg/services/object/acl/opts.go | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/services/object/acl/acl.go b/pkg/services/object/acl/acl.go index 200b037bf..9c024ffd9 100644 --- a/pkg/services/object/acl/acl.go +++ b/pkg/services/object/acl/acl.go @@ -17,7 +17,7 @@ import ( crypto "github.com/nspcc-dev/neofs-crypto" 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/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" eaclV2 "github.com/nspcc-dev/neofs-node/pkg/services/object/acl/eacl/v2" "github.com/pkg/errors" @@ -84,7 +84,7 @@ type eACLCfg struct { eACL *eacl.Validator - localStorage *localstore.Storage + localStorage *engine.StorageEngine state netmap.State } diff --git a/pkg/services/object/acl/eacl/v2/localstore.go b/pkg/services/object/acl/eacl/v2/localstore.go index aef44fafe..b1552f9b4 100644 --- a/pkg/services/object/acl/eacl/v2/localstore.go +++ b/pkg/services/object/acl/eacl/v2/localstore.go @@ -5,11 +5,11 @@ import ( 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/local_object_storage/localstore" + "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine" ) type localStorage struct { - ls *localstore.Storage + ls *engine.StorageEngine } 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 s.ls.Head(addr) + return engine.Head(s.ls, addr) } diff --git a/pkg/services/object/acl/eacl/v2/opts.go b/pkg/services/object/acl/eacl/v2/opts.go index 898520fad..2a0454819 100644 --- a/pkg/services/object/acl/eacl/v2/opts.go +++ b/pkg/services/object/acl/eacl/v2/opts.go @@ -1,7 +1,7 @@ package v2 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 { @@ -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) { c.storage = &localStorage{ ls: v, diff --git a/pkg/services/object/acl/opts.go b/pkg/services/object/acl/opts.go index 19b9c286c..13952c446 100644 --- a/pkg/services/object/acl/opts.go +++ b/pkg/services/object/acl/opts.go @@ -4,7 +4,7 @@ import ( "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/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" ) @@ -37,7 +37,7 @@ func WithEACLValidatorOptions(v ...eacl.Option) Option { } // WithLocalStorage returns options to set local object storage. -func WithLocalStorage(v *localstore.Storage) Option { +func WithLocalStorage(v *engine.StorageEngine) Option { return func(c *cfg) { c.localStorage = v }