From fef172c5b03f424953601eaa281b70874a4bd087 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Fri, 30 Dec 2022 18:04:24 +0300 Subject: [PATCH] [#6] services/util: Simplify `response.Service` It has only 1 parameter, which is obligatory. Signed-off-by: Evgenii Stratonikov --- cmd/frostfs-node/config.go | 2 +- pkg/services/util/response/service.go | 40 ++++----------------------- 2 files changed, 7 insertions(+), 35 deletions(-) diff --git a/cmd/frostfs-node/config.go b/cmd/frostfs-node/config.go index 267a05aa..c088d2f0 100644 --- a/cmd/frostfs-node/config.go +++ b/cmd/frostfs-node/config.go @@ -622,7 +622,7 @@ func initShared(appCfg *config.Config, key *keys.PrivateKey, netState *networkSt key: key, binPublicKey: key.PublicKey().Bytes(), localAddr: netAddr, - respSvc: response.NewService(response.WithNetworkState(netState)), + respSvc: response.NewService(netState), clientCache: cache.NewSDKClientCache(cacheOpts), bgClientCache: cache.NewSDKClientCache(cacheOpts), putClientCache: cache.NewSDKClientCache(cacheOpts), diff --git a/pkg/services/util/response/service.go b/pkg/services/util/response/service.go index a63d5343..005a643e 100644 --- a/pkg/services/util/response/service.go +++ b/pkg/services/util/response/service.go @@ -11,45 +11,24 @@ import ( // Service represents universal v2 service // that sets response meta header values. type Service struct { - cfg *cfg -} - -// Option is an option of Service constructor. -type Option func(*cfg) - -type cfg struct { version refs.Version state netmap.State } -func defaultCfg() *cfg { - var c cfg - - version.Current().WriteToV2(&c.version) - - return &c -} - // NewService creates, initializes and returns Service instance. -func NewService(opts ...Option) *Service { - c := defaultCfg() - - for i := range opts { - opts[i](c) - } - - return &Service{ - cfg: c, - } +func NewService(nmState netmap.State) *Service { + s := &Service{state: nmState} + version.Current().WriteToV2(&s.version) + return s } // SetMeta sets adds meta-header to resp. func (s *Service) SetMeta(resp util.ResponseMessage) { meta := new(session.ResponseMetaHeader) - meta.SetVersion(&s.cfg.version) + meta.SetVersion(&s.version) meta.SetTTL(1) // FIXME: #1160 TTL must be calculated - meta.SetEpoch(s.cfg.state.CurrentEpoch()) + meta.SetEpoch(s.state.CurrentEpoch()) if origin := resp.GetMetaHeader(); origin != nil { // FIXME: #1160 what if origin is set by local server? @@ -58,10 +37,3 @@ func (s *Service) SetMeta(resp util.ResponseMessage) { resp.SetMetaHeader(meta) } - -// WithNetworkState returns option to set network state of Service. -func WithNetworkState(v netmap.State) Option { - return func(c *cfg) { - c.state = v - } -}