[#6] services/object: Remove pointer unneeded indirections

All `Service` are accessed by pointer.

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>

pkg/services/object/acl/eacl/v2/headers.go

@@ -45,31 +45,30 @@ type headerSource struct {
 	incompleteObjectHeaders bool
 }
 
-func defaultCfg() *cfg {
+func (c *cfg) initDefault() {
-	return &cfg{
+	c.storage = new(localStorage)
-		storage: new(localStorage),
-	}
 }
 
 func NewMessageHeaderSource(opts ...Option) (eaclSDK.TypedHeaderSource, error) {
-	cfg := defaultCfg()
+	var c cfg
+	c.initDefault()
 
 	for i := range opts {
-		opts[i](cfg)
+		opts[i](&c)
 	}
 
-	if cfg.msg == nil {
+	if c.msg == nil {
 		return nil, errors.New("message is not provided")
 	}
 
 	var res headerSource
 
-	err := cfg.readObjectHeaders(&res)
+	err := c.readObjectHeaders(&res)
 	if err != nil {
 		return nil, err
 	}
 
-	res.requestHeaders = requestHeaders(cfg.msg)
+	res.requestHeaders = requestHeaders(c.msg)
 
 	return res, nil
 }

pkg/services/object/acl/v2/service.go

@@ -21,7 +21,7 @@ import (
 
 // Service checks basic ACL rules.
 type Service struct {
-	*cfg
+	cfg
 
 	c senderClassifier
 }
@@ -72,18 +72,17 @@ type cfg struct {
 	next object.ServiceServer
 }
 
-func defaultCfg() *cfg {
+func (c *cfg) initDefault() {
-	return &cfg{
+	c.log = &logger.Logger{Logger: zap.L()}
-		log: &logger.Logger{Logger: zap.L()},
-	}
 }
 
 // New is a constructor for object ACL checking service.
-func New(opts ...Option) Service {
+func New(opts ...Option) *Service {
-	cfg := defaultCfg()
+	var s Service
+	s.cfg.initDefault()
 
 	for i := range opts {
-		opts[i](cfg)
+		opts[i](&s.cfg)
 	}
 
 	panicOnNil := func(v any, name string) {
@@ -92,20 +91,18 @@ func New(opts ...Option) Service {
 		}
 	}
 
-	panicOnNil(cfg.next, "next Service")
+	panicOnNil(s.cfg.next, "next Service")
-	panicOnNil(cfg.nm, "netmap client")
+	panicOnNil(s.cfg.nm, "netmap client")
-	panicOnNil(cfg.irFetcher, "inner Ring fetcher")
+	panicOnNil(s.cfg.irFetcher, "inner Ring fetcher")
-	panicOnNil(cfg.checker, "acl checker")
+	panicOnNil(s.cfg.checker, "acl checker")
-	panicOnNil(cfg.containers, "container source")
+	panicOnNil(s.cfg.containers, "container source")
 
-	return Service{
+	s.c = senderClassifier{
-		cfg: cfg,
+		log:       s.cfg.log,
-		c: senderClassifier{
+		innerRing: s.cfg.irFetcher,
-			log:       cfg.log,
+		netmap:    s.cfg.nm,
-			innerRing: cfg.irFetcher,
-			netmap:    cfg.nm,
-		},
 	}
+	return &s
 }
 
 // Get implements ServiceServer interface, makes ACL checks and calls

pkg/services/object/delete/service.go

@@ -15,7 +15,7 @@ import (
 
 // Service utility serving requests of Object.Get service.
 type Service struct {
-	*cfg
+	cfg
 }
 
 // Option is a Service's constructor option.
@@ -60,24 +60,21 @@ type cfg struct {
 	keyStorage *util.KeyStorage
 }
 
-func defaultCfg() *cfg {
+func (c *cfg) initDefault() {
-	return &cfg{
+	c.log = &logger.Logger{Logger: zap.L()}
-		log: &logger.Logger{Logger: zap.L()},
-	}
 }
 
 // New creates, initializes and returns utility serving
 // Object.Get service requests.
 func New(opts ...Option) *Service {
-	c := defaultCfg()
+	var s Service
+	s.cfg.initDefault()
 
 	for i := range opts {
-		opts[i](c)
+		opts[i](&s.cfg)
 	}
 
-	return &Service{
+	return &s
-		cfg: c,
-	}
 }
 
 // WithLogger returns option to specify Delete service's logger.

pkg/services/object/delete/v2/service.go

@@ -9,7 +9,7 @@ import (
 
 // Service implements Delete operation of Object service v2.
 type Service struct {
-	*cfg
+	cfg
 }
 
 // Option represents Service constructor option.
@@ -21,15 +21,13 @@ type cfg struct {
 
 // NewService constructs Service instance from provided options.
 func NewService(opts ...Option) *Service {
-	c := new(cfg)
+	var s Service
 
 	for i := range opts {
-		opts[i](c)
+		opts[i](&s.cfg)
 	}
 
-	return &Service{
+	return &s
-		cfg: c,
-	}
 }
 
 // Delete calls internal service.

pkg/services/object/get/get_test.go

@@ -211,7 +211,7 @@ func TestGetLocalOnly(t *testing.T) {
 	ctx := context.Background()
 
 	newSvc := func(storage *testStorage) *Service {
-		svc := &Service{cfg: new(cfg)}
+		svc := &Service{}
 		svc.log = test.NewLogger(false)
 		svc.localStorage = storage
 		svc.assembly = true
@@ -473,7 +473,7 @@ func TestGetRemoteSmall(t *testing.T) {
 	container.CalculateID(&idCnr, cnr)
 
 	newSvc := func(b *testPlacementBuilder, c *testClientCache) *Service {
-		svc := &Service{cfg: new(cfg)}
+		svc := &Service{}
 		svc.log = test.NewLogger(false)
 		svc.localStorage = newTestStorage()
 		svc.assembly = true
@@ -1150,7 +1150,7 @@ func TestGetFromPastEpoch(t *testing.T) {
 	c22 := newTestClient()
 	c22.addResult(addr, obj, nil)
 
-	svc := &Service{cfg: new(cfg)}
+	svc := &Service{}
 	svc.log = test.NewLogger(false)
 	svc.localStorage = newTestStorage()
 	svc.assembly = true

pkg/services/object/get/service.go

@@ -15,7 +15,7 @@ import (
 
 // Service utility serving requests of Object.Get service.
 type Service struct {
-	*cfg
+	cfg
 }
 
 // Option is a Service's constructor option.
@@ -51,27 +51,24 @@ type epochSource interface {
 	Epoch() (uint64, error)
 }
 
-func defaultCfg() *cfg {
+func (c *cfg) initDefault() {
-	return &cfg{
+	c.log = &logger.Logger{Logger: zap.L()}
-		assembly:     true,
+	c.localStorage = new(storageEngineWrapper)
-		log:          &logger.Logger{Logger: zap.L()},
+	c.assembly = true
-		localStorage: new(storageEngineWrapper),
+	c.clientCache = new(clientCacheWrapper)
-		clientCache:  new(clientCacheWrapper),
-	}
 }
 
 // New creates, initializes and returns utility serving
 // Object.Get service requests.
 func New(opts ...Option) *Service {
-	c := defaultCfg()
+	var s Service
+	s.cfg.initDefault()
 
 	for i := range opts {
-		opts[i](c)
+		opts[i](&s.cfg)
 	}
 
-	return &Service{
+	return &s
-		cfg: c,
-	}
 }
 
 // WithLogger returns option to specify Get service's logger.

pkg/services/object/get/v2/service.go

@@ -13,7 +13,7 @@ import (
 
 // Service implements Get operation of Object service v2.
 type Service struct {
-	*cfg
+	cfg
 }
 
 // Option represents Service constructor option.
@@ -27,15 +27,13 @@ type cfg struct {
 
 // NewService constructs Service instance from provided options.
 func NewService(opts ...Option) *Service {
-	c := new(cfg)
+	var s Service
 
 	for i := range opts {
-		opts[i](c)
+		opts[i](&s.cfg)
 	}
 
-	return &Service{
+	return &s
-		cfg: c,
-	}
 }
 
 // Get calls internal service and returns v2 object stream.

pkg/services/object/put/service.go

@@ -22,7 +22,7 @@ type MaxSizeSource interface {
 }
 
 type Service struct {
-	*cfg
+	cfg
 }
 
 type Option func(*cfg)
@@ -57,31 +57,28 @@ type cfg struct {
 	log *logger.Logger
 }
 
-func defaultCfg() *cfg {
+func (c *cfg) initDefault() {
-	return &cfg{
+	c.remotePool = util.NewPseudoWorkerPool()
-		remotePool: util.NewPseudoWorkerPool(),
+	c.localPool = util.NewPseudoWorkerPool()
-		localPool:  util.NewPseudoWorkerPool(),
+	c.log = &logger.Logger{Logger: zap.L()}
-		log:        &logger.Logger{Logger: zap.L()},
-	}
 }
 
 func NewService(opts ...Option) *Service {
-	c := defaultCfg()
+	var s Service
+	s.cfg.initDefault()
 
 	for i := range opts {
-		opts[i](c)
+		opts[i](&s.cfg)
 	}
 
-	c.fmtValidator = object.NewFormatValidator(c.fmtValidatorOpts...)
+	s.cfg.fmtValidator = object.NewFormatValidator(s.cfg.fmtValidatorOpts...)
 
-	return &Service{
+	return &s
-		cfg: c,
-	}
 }
 
 func (p *Service) Put(ctx context.Context) (*Streamer, error) {
 	return &Streamer{
-		cfg: p.cfg,
+		cfg: &p.cfg,
 		ctx: ctx,
 	}, nil
 }

pkg/services/object/put/v2/service.go

@@ -11,7 +11,7 @@ import (
 
 // Service implements Put operation of Object service v2.
 type Service struct {
-	*cfg
+	cfg
 }
 
 // Option represents Service constructor option.
@@ -24,15 +24,13 @@ type cfg struct {
 
 // NewService constructs Service instance from provided options.
 func NewService(opts ...Option) *Service {
-	c := new(cfg)
+	var s Service
 
 	for i := range opts {
-		opts[i](c)
+		opts[i](&s.cfg)
 	}
 
-	return &Service{
+	return &s
-		cfg: c,
-	}
 }
 
 // Put calls internal service and returns v2 object streamer.

pkg/services/object/search/search_test.go

@@ -146,7 +146,7 @@ func TestGetLocalOnly(t *testing.T) {
 	ctx := context.Background()
 
 	newSvc := func(storage *testStorage) *Service {
-		svc := &Service{cfg: new(cfg)}
+		svc := &Service{}
 		svc.log = test.NewLogger(false)
 		svc.localStorage = storage
 
@@ -248,7 +248,7 @@ func TestGetRemoteSmall(t *testing.T) {
 	container.CalculateID(&id, cnr)
 
 	newSvc := func(b *testPlacementBuilder, c *testClientCache) *Service {
-		svc := &Service{cfg: new(cfg)}
+		svc := &Service{}
 		svc.log = test.NewLogger(false)
 		svc.localStorage = newTestStorage()
 
@@ -357,7 +357,7 @@ func TestGetFromPastEpoch(t *testing.T) {
 	ids22 := generateIDs(10)
 	c22.addResult(idCnr, ids22, nil)
 
-	svc := &Service{cfg: new(cfg)}
+	svc := &Service{}
 	svc.log = test.NewLogger(false)
 	svc.localStorage = newTestStorage()
 

pkg/services/object/search/service.go

@@ -15,7 +15,7 @@ import (
 // Service is an utility serving requests
 // of Object.Search service.
 type Service struct {
-	*cfg
+	cfg
 }
 
 // Option is a Service's constructor option.
@@ -55,25 +55,22 @@ type epochSource interface {
 	Epoch() (uint64, error)
 }
 
-func defaultCfg() *cfg {
+func (c *cfg) initDefault() {
-	return &cfg{
+	c.log = &logger.Logger{Logger: zap.L()}
-		log:               &logger.Logger{Logger: zap.L()},
+	c.clientConstructor = new(clientConstructorWrapper)
-		clientConstructor: new(clientConstructorWrapper),
-	}
 }
 
 // New creates, initializes and returns utility serving
 // Object.Get service requests.
 func New(opts ...Option) *Service {
-	c := defaultCfg()
+	var s Service
+	s.cfg.initDefault()
 
 	for i := range opts {
-		opts[i](c)
+		opts[i](&s.cfg)
 	}
 
-	return &Service{
+	return &s
-		cfg: c,
-	}
 }
 
 // WithLogger returns option to specify Get service's logger.

pkg/services/object/search/v2/service.go

@@ -9,7 +9,7 @@ import (
 
 // Service implements Search operation of Object service v2.
 type Service struct {
-	*cfg
+	cfg
 }
 
 // Option represents Service constructor option.
@@ -23,15 +23,13 @@ type cfg struct {
 
 // NewService constructs Service instance from provided options.
 func NewService(opts ...Option) *Service {
-	c := new(cfg)
+	var s Service
 
 	for i := range opts {
-		opts[i](c)
+		opts[i](&s.cfg)
 	}
 
-	return &Service{
+	return &s
-		cfg: c,
-	}
 }
 
 // Search calls internal service and returns v2 object stream.