From e07869a8cf918349acfdcfa5058931352b3a9e71 Mon Sep 17 00:00:00 2001 From: Ekaterina Lebedeva Date: Sat, 27 Apr 2024 15:24:11 +0300 Subject: [PATCH] [#1100] Remove unused fields Signed-off-by: Ekaterina Lebedeva --- .../internal/modules/morph/helper/local_client.go | 8 +++----- cmd/frostfs-cli/modules/container/policy_playground.go | 8 +++----- pkg/innerring/innerring.go | 3 --- pkg/local_object_storage/pilorama/heap.go | 2 -- pkg/services/object/acl/v2/request_test.go | 1 + pkg/services/policer/option.go | 3 +-- 6 files changed, 8 insertions(+), 17 deletions(-) diff --git a/cmd/frostfs-adm/internal/modules/morph/helper/local_client.go b/cmd/frostfs-adm/internal/modules/morph/helper/local_client.go index d309e7e5..31203dde 100644 --- a/cmd/frostfs-adm/internal/modules/morph/helper/local_client.go +++ b/cmd/frostfs-adm/internal/modules/morph/helper/local_client.go @@ -44,7 +44,6 @@ type LocalClient struct { transactions []*transaction.Transaction dumpPath string accounts []*wallet.Account - maxGasInvoke int64 } func NewLocalClient(cmd *cobra.Command, v *viper.Viper, wallets []*wallet.Wallet, dumpPath string) (*LocalClient, error) { @@ -104,10 +103,9 @@ func NewLocalClient(cmd *cobra.Command, v *viper.Viper, wallets []*wallet.Wallet } return &LocalClient{ - bc: bc, - dumpPath: dumpPath, - accounts: accounts[:m], - maxGasInvoke: 15_0000_0000, + bc: bc, + dumpPath: dumpPath, + accounts: accounts[:m], }, nil } diff --git a/cmd/frostfs-cli/modules/container/policy_playground.go b/cmd/frostfs-cli/modules/container/policy_playground.go index 1ac41f08..095ab643 100644 --- a/cmd/frostfs-cli/modules/container/policy_playground.go +++ b/cmd/frostfs-cli/modules/container/policy_playground.go @@ -20,14 +20,12 @@ import ( type policyPlaygroundREPL struct { cmd *cobra.Command - args []string nodes map[string]netmap.NodeInfo } -func newPolicyPlaygroundREPL(cmd *cobra.Command, args []string) (*policyPlaygroundREPL, error) { +func newPolicyPlaygroundREPL(cmd *cobra.Command) (*policyPlaygroundREPL, error) { return &policyPlaygroundREPL{ cmd: cmd, - args: args, nodes: map[string]netmap.NodeInfo{}, }, nil } @@ -221,8 +219,8 @@ var policyPlaygroundCmd = &cobra.Command{ Short: "A REPL for testing placement policies", Long: `A REPL for testing placement policies. If a wallet and endpoint is provided, the initial netmap data will be loaded from the snapshot of the node. Otherwise, an empty playground is created.`, - Run: func(cmd *cobra.Command, args []string) { - repl, err := newPolicyPlaygroundREPL(cmd, args) + Run: func(cmd *cobra.Command, _ []string) { + repl, err := newPolicyPlaygroundREPL(cmd) commonCmd.ExitOnErr(cmd, "could not create policy playground: %w", err) commonCmd.ExitOnErr(cmd, "policy playground failed: %w", repl.run()) }, diff --git a/pkg/innerring/innerring.go b/pkg/innerring/innerring.go index 11d43f84..5dea18f9 100644 --- a/pkg/innerring/innerring.go +++ b/pkg/innerring/innerring.go @@ -69,7 +69,6 @@ type ( // internal variables key *keys.PrivateKey - pubKey []byte contracts *contracts predefinedValidators keys.PublicKeys initialEpochTickDelta uint32 @@ -391,8 +390,6 @@ func New(ctx context.Context, log *logger.Logger, cfg *viper.Viper, errChan chan return nil, fmt.Errorf("ir: can't parse predefined validators list: %w", err) } - server.pubKey = server.key.PublicKey().Bytes() - var morphClients *serverMorphClients morphClients, err = server.initClientsFromMorph() if err != nil { diff --git a/pkg/local_object_storage/pilorama/heap.go b/pkg/local_object_storage/pilorama/heap.go index 50abb663..d81ec735 100644 --- a/pkg/local_object_storage/pilorama/heap.go +++ b/pkg/local_object_storage/pilorama/heap.go @@ -29,7 +29,6 @@ func (h *filenameHeap) Pop() any { // fixedHeap maintains a fixed number of smallest elements started at some point. type fixedHeap struct { start string - max string count int h *filenameHeap } @@ -40,7 +39,6 @@ func newHeap(start string, count int) *fixedHeap { return &fixedHeap{ start: start, - max: "", count: count, h: h, } diff --git a/pkg/services/object/acl/v2/request_test.go b/pkg/services/object/acl/v2/request_test.go index 6c6d79ad..980d1a2e 100644 --- a/pkg/services/object/acl/v2/request_test.go +++ b/pkg/services/object/acl/v2/request_test.go @@ -133,6 +133,7 @@ type smWrapper struct { func (s smWrapper) ReadSignedData(data []byte) ([]byte, error) { return s.Token.GetBody().StableMarshal(data), nil } + func (s smWrapper) SignedDataSize() int { return s.Token.GetBody().StableSize() } diff --git a/pkg/services/policer/option.go b/pkg/services/policer/option.go index 92cf83a8..58c74ee1 100644 --- a/pkg/services/policer/option.go +++ b/pkg/services/policer/option.go @@ -66,7 +66,7 @@ type cfg struct { batchSize, cacheSize uint32 - rebalanceFreq, evictDuration, sleepDuration time.Duration + evictDuration, sleepDuration time.Duration metrics MetricsRegister } @@ -76,7 +76,6 @@ func defaultCfg() *cfg { log: &logger.Logger{Logger: zap.L()}, batchSize: 10, cacheSize: 1024, // 1024 * address size = 1024 * 64 = 64 MiB - rebalanceFreq: 1 * time.Second, sleepDuration: 1 * time.Second, evictDuration: 30 * time.Second, metrics: noopMetrics{},