[#1689] linter: Fix staticcheck warning: 'embedded field can be simplified'

Change-Id: I8f454f7d09973cdea096495c3949b88cdd01102e
Signed-off-by: Alexander Chuprov <a.chuprov@yadro.com>

cmd/frostfs-adm/internal/modules/morph/contract/dump_hashes.go

@@ -242,7 +242,7 @@ func fillContractVersion(cmd *cobra.Command, c helper.Client, infos []contractDu
 
 			script := sub.Bytes()
 			emit.Instruction(bw.BinWriter, opcode.TRY, []byte{byte(3 + len(script) + 2), 0})
-			bw.BinWriter.WriteBytes(script)
+			bw.WriteBytes(script)
 			emit.Instruction(bw.BinWriter, opcode.ENDTRY, []byte{2 + 1})
 			emit.Opcodes(bw.BinWriter, opcode.PUSH0)
 		}

cmd/frostfs-lens/internal/tui/input.go

@@ -53,17 +53,17 @@ func (f *InputFieldWithHistory) InputHandler() func(event *tcell.EventKey, setFo
 			f.historyPointer++
 			// Stop iterating over history.
 			if f.historyPointer == len(f.history) {
-				f.InputField.SetText(f.currentContent)
+				f.SetText(f.currentContent)
 				return
 			}
-			f.InputField.SetText(f.history[f.historyPointer])
+			f.SetText(f.history[f.historyPointer])
 		case tcell.KeyUp:
 			if len(f.history) == 0 {
 				return
 			}
 			// Start iterating over history.
 			if f.historyPointer == len(f.history) {
-				f.currentContent = f.InputField.GetText()
+				f.currentContent = f.GetText()
 			}
 			// End of history.
 			if f.historyPointer == 0 {
@@ -71,7 +71,7 @@ func (f *InputFieldWithHistory) InputHandler() func(event *tcell.EventKey, setFo
 			}
 			// Iterate to least recent prompts.
 			f.historyPointer--
-			f.InputField.SetText(f.history[f.historyPointer])
+			f.SetText(f.history[f.historyPointer])
 		default:
 			f.InputField.InputHandler()(event, func(tview.Primitive) {})
 		}

cmd/frostfs-lens/internal/tui/ui.go

@@ -482,7 +482,7 @@ func (ui *UI) handleInputOnSearching(event *tcell.EventKey) {
 		ui.searchBar.InputHandler()(event, func(tview.Primitive) {})
 	}
 
-	ui.Box.MouseHandler()
+	ui.MouseHandler()
 }
 
 func (ui *UI) WithPrompt(prompt string) error {

cmd/frostfs-node/apemanager.go

@@ -14,7 +14,7 @@ import (
 func initAPEManagerService(c *cfg) {
 	contractStorage := ape_contract.NewProxyVerificationContractStorage(
 		morph.NewSwitchRPCGuardedActor(c.cfgMorph.client),
-		c.shared.key,
+		c.key,
 		c.cfgMorph.proxyScriptHash,
 		c.cfgObject.cfgAccessPolicyEngine.policyContractHash)
 

cmd/frostfs-node/container.go

@@ -32,7 +32,7 @@ func initContainerService(_ context.Context, c *cfg) {
 	wrap, err := cntClient.NewFromMorph(c.cfgMorph.client, c.cfgContainer.scriptHash, 0)
 	fatalOnErr(err)
 
-	c.shared.cnrClient = wrap
+	c.cnrClient = wrap
 
 	cnrSrc := cntClient.AsContainerSource(wrap)
 
@@ -47,7 +47,7 @@ func initContainerService(_ context.Context, c *cfg) {
 		frostfsIDSubjectProvider = newMorphFrostfsIDCache(frostfsIDSubjectProvider, int(cacheSize), c.cfgMorph.cacheTTL, metrics.NewCacheMetrics("frostfs_id"))
 	}
 
-	c.shared.frostfsidClient = frostfsIDSubjectProvider
+	c.frostfsidClient = frostfsIDSubjectProvider
 	c.cfgContainer.containerBatchSize = containerconfig.ContainerBatchSize(c.appCfg)
 
 	defaultChainRouter := engine.NewDefaultChainRouterWithLocalOverrides(
@@ -57,7 +57,7 @@ func initContainerService(_ context.Context, c *cfg) {
 	service := containerService.NewSignService(
 		&c.key.PrivateKey,
 		containerService.NewAPEServer(defaultChainRouter, cnrRdr,
-			newCachedIRFetcher(createInnerRingFetcher(c)), c.netMapSource, c.shared.frostfsidClient,
+			newCachedIRFetcher(createInnerRingFetcher(c)), c.netMapSource, c.frostfsidClient,
 			containerService.NewSplitterService(
 				c.cfgContainer.containerBatchSize, c.respSvc,
 				containerService.NewExecutionService(containerMorph.NewExecutor(cnrRdr, cnrWrt), c.respSvc)),

cmd/frostfs-node/metrics.go

@@ -8,38 +8,38 @@ import (
 func metricsComponent(c *cfg) (*httpComponent, bool) {
 	var updated bool
 	// check if it has been inited before
-	if c.dynamicConfiguration.metrics == nil {
-		c.dynamicConfiguration.metrics = new(httpComponent)
-		c.dynamicConfiguration.metrics.cfg = c
-		c.dynamicConfiguration.metrics.name = "metrics"
-		c.dynamicConfiguration.metrics.handler = metrics.Handler()
+	if c.metrics == nil {
+		c.metrics = new(httpComponent)
+		c.metrics.cfg = c
+		c.metrics.name = "metrics"
+		c.metrics.handler = metrics.Handler()
 		updated = true
 	}
 
 	// (re)init read configuration
 	enabled := metricsconfig.Enabled(c.appCfg)
-	if enabled != c.dynamicConfiguration.metrics.enabled {
-		c.dynamicConfiguration.metrics.enabled = enabled
+	if enabled != c.metrics.enabled {
+		c.metrics.enabled = enabled
 		updated = true
 	}
 	address := metricsconfig.Address(c.appCfg)
-	if address != c.dynamicConfiguration.metrics.address {
-		c.dynamicConfiguration.metrics.address = address
+	if address != c.metrics.address {
+		c.metrics.address = address
 		updated = true
 	}
 	dur := metricsconfig.ShutdownTimeout(c.appCfg)
-	if dur != c.dynamicConfiguration.metrics.shutdownDur {
-		c.dynamicConfiguration.metrics.shutdownDur = dur
+	if dur != c.metrics.shutdownDur {
+		c.metrics.shutdownDur = dur
 		updated = true
 	}
 
-	return c.dynamicConfiguration.metrics, updated
+	return c.metrics, updated
 }
 
 func enableMetricsSvc(c *cfg) {
-	c.shared.metricsSvc.Enable()
+	c.metricsSvc.Enable()
 }
 
 func disableMetricsSvc(c *cfg) {
-	c.shared.metricsSvc.Disable()
+	c.metricsSvc.Disable()
 }

cmd/frostfs-node/object.go

@@ -186,9 +186,9 @@ func initObjectService(c *cfg) {
 		respSvc,
 	)
 
-	c.shared.metricsSvc = objectService.NewMetricCollector(
+	c.metricsSvc = objectService.NewMetricCollector(
 		signSvc, c.metricsCollector.ObjectService(), metricsconfig.Enabled(c.appCfg))
-	qosService := objectService.NewQoSObjectService(c.shared.metricsSvc, &c.cfgQoSService)
+	qosService := objectService.NewQoSObjectService(c.metricsSvc, &c.cfgQoSService)
 	auditSvc := objectService.NewAuditService(qosService, c.log, c.audit)
 	server := objectTransportGRPC.New(auditSvc)
 
@@ -432,7 +432,7 @@ func createAPEService(c *cfg, irFetcher *cachedIRFetcher, splitSvc *objectServic
 			c.cfgObject.cfgAccessPolicyEngine.accessPolicyEngine.LocalStorage(),
 			c.cfgObject.cfgAccessPolicyEngine.accessPolicyEngine.MorphRuleChainStorage(),
 			objectAPE.NewStorageEngineHeaderProvider(c.cfgObject.cfgLocalStorage.localStorage, c.cfgObject.getSvc),
-			c.shared.frostfsidClient,
+			c.frostfsidClient,
 			c.netMapSource,
 			c.cfgNetmap.state,
 			c.cfgObject.cnrSource,

cmd/frostfs-node/pprof.go

@@ -18,33 +18,33 @@ func initProfilerService(ctx context.Context, c *cfg) {
 func pprofComponent(c *cfg) (*httpComponent, bool) {
 	var updated bool
 	// check if it has been inited before
-	if c.dynamicConfiguration.pprof == nil {
-		c.dynamicConfiguration.pprof = new(httpComponent)
-		c.dynamicConfiguration.pprof.cfg = c
-		c.dynamicConfiguration.pprof.name = "pprof"
-		c.dynamicConfiguration.pprof.handler = httputil.Handler()
-		c.dynamicConfiguration.pprof.preReload = tuneProfilers
+	if c.pprof == nil {
+		c.pprof = new(httpComponent)
+		c.pprof.cfg = c
+		c.pprof.name = "pprof"
+		c.pprof.handler = httputil.Handler()
+		c.pprof.preReload = tuneProfilers
 		updated = true
 	}
 
 	// (re)init read configuration
 	enabled := profilerconfig.Enabled(c.appCfg)
-	if enabled != c.dynamicConfiguration.pprof.enabled {
-		c.dynamicConfiguration.pprof.enabled = enabled
+	if enabled != c.pprof.enabled {
+		c.pprof.enabled = enabled
 		updated = true
 	}
 	address := profilerconfig.Address(c.appCfg)
-	if address != c.dynamicConfiguration.pprof.address {
-		c.dynamicConfiguration.pprof.address = address
+	if address != c.pprof.address {
+		c.pprof.address = address
 		updated = true
 	}
 	dur := profilerconfig.ShutdownTimeout(c.appCfg)
-	if dur != c.dynamicConfiguration.pprof.shutdownDur {
-		c.dynamicConfiguration.pprof.shutdownDur = dur
+	if dur != c.pprof.shutdownDur {
+		c.pprof.shutdownDur = dur
 		updated = true
 	}
 
-	return c.dynamicConfiguration.pprof, updated
+	return c.pprof, updated
 }
 
 func tuneProfilers(c *cfg) {

cmd/frostfs-node/tree.go

@@ -51,9 +51,9 @@ func initTreeService(c *cfg) {
 	c.treeService = tree.New(
 		tree.WithContainerSource(cnrSource{
 			src: c.cfgObject.cnrSource,
-			cli: c.shared.cnrClient,
+			cli: c.cnrClient,
 		}),
-		tree.WithFrostfsidSubjectProvider(c.shared.frostfsidClient),
+		tree.WithFrostfsidSubjectProvider(c.frostfsidClient),
 		tree.WithNetmapSource(c.netMapSource),
 		tree.WithPrivateKey(&c.key.PrivateKey),
 		tree.WithLogger(c.log),