dstepanov-yadro/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#285] lint: Fix revive/unused-parameter

Browse source 
Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2023-04-26 11:24:40 +03:00
parent 57718bd6b4
commit f07e2d4812
19 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/frostfs-adm/internal/modules/config/config.go
View file

@ -47,7 +47,7 @@ credentials:
{{.}}: password{{end}} {{.}}: password{{end}}
` `
func initConfig(cmd *cobra.Command, args []string) error { func initConfig(cmd *cobra.Command, _ []string) error {
configPath, err := readConfigPathFromArgs(cmd) configPath, err := readConfigPathFromArgs(cmd)
if err != nil { if err != nil {
return nil return nil

2
cmd/frostfs-adm/internal/modules/morph/epoch.go
View file

@ -13,7 +13,7 @@ import (
"github.com/spf13/viper" "github.com/spf13/viper"
) )
func forceNewEpochCmd(cmd *cobra.Command, args []string) error { func forceNewEpochCmd(cmd *cobra.Command, _ []string) error {
wCtx, err := newInitializeContext(cmd, viper.GetViper()) wCtx, err := newInitializeContext(cmd, viper.GetViper())
if err != nil { if err != nil {
return fmt.Errorf("can't to initialize context: %w", err) return fmt.Errorf("can't to initialize context: %w", err)

2
cmd/frostfs-adm/internal/modules/morph/generate.go
View file

@ -29,7 +29,7 @@ const (
consensusAccountName = "consensus" consensusAccountName = "consensus"
) )
func generateAlphabetCreds(cmd *cobra.Command, args []string) error { func generateAlphabetCreds(cmd *cobra.Command, _ []string) error {
// alphabet size is not part of the config // alphabet size is not part of the config
size, err := cmd.Flags().GetUint(alphabetSizeFlag) size, err := cmd.Flags().GetUint(alphabetSizeFlag)
if err != nil { if err != nil {

6
cmd/frostfs-adm/internal/modules/morph/initialize.go
View file

@ -45,7 +45,7 @@ type initializeContext struct {
ContractPath string ContractPath string
} }
func initializeSideChainCmd(cmd *cobra.Command, args []string) error { func initializeSideChainCmd(cmd *cobra.Command, _ []string) error {
initCtx, err := newInitializeContext(cmd, viper.GetViper()) initCtx, err := newInitializeContext(cmd, viper.GetViper())
if err != nil { if err != nil {
return fmt.Errorf("initialization error: %w", err) return fmt.Errorf("initialization error: %w", err)
@ -142,7 +142,7 @@ func newInitializeContext(cmd *cobra.Command, v *viper.Viper) (*initializeContex
return nil, err return nil, err
} }
ctrPath, err := getContractsPath(cmd, v, needContracts) ctrPath, err := getContractsPath(cmd, needContracts)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -222,7 +222,7 @@ func getWallet(cmd *cobra.Command, v *viper.Viper, needContracts bool, walletDir
return openContractWallet(v, cmd, walletDir) return openContractWallet(v, cmd, walletDir)
} }
func getContractsPath(cmd *cobra.Command, v *viper.Viper, needContracts bool) (string, error) { func getContractsPath(cmd *cobra.Command, needContracts bool) (string, error) {
if !needContracts { if !needContracts {
return "", nil return "", nil
} }

2
cmd/frostfs-adm/internal/modules/morph/local_client.go
View file

@ -248,7 +248,7 @@ func (l *localClient) GetVersion() (*result.Version, error) {
}, nil }, nil
} }
func (l *localClient) InvokeContractVerify(contract util.Uint160, params []smartcontract.Parameter, signers []transaction.Signer, witnesses ...transaction.Witness) (*result.Invoke, error) { func (l *localClient) InvokeContractVerify(util.Uint160, []smartcontract.Parameter, []transaction.Signer, ...transaction.Witness) (*result.Invoke, error) {
// not used by `morph init` command // not used by `morph init` command
panic("unexpected call") panic("unexpected call")
} }

2
cmd/frostfs-adm/internal/modules/root.go
View file

@ -52,7 +52,7 @@ func Execute() error {
return rootCmd.Execute() return rootCmd.Execute()
} }
func entryPoint(cmd *cobra.Command, args []string) error { func entryPoint(cmd *cobra.Command, _ []string) error {
printVersion, _ := cmd.Flags().GetBool("version") printVersion, _ := cmd.Flags().GetBool("version")
if printVersion { if printVersion {
cmd.Print(misc.BuildInfo("FrostFS Adm")) cmd.Print(misc.BuildInfo("FrostFS Adm"))

2
pkg/innerring/initialization.go
View file

@ -159,7 +159,7 @@ func (s *Server) enableNotarySupport() error {
return nil return nil
} }
func (s *Server) initNotaryConfig(cfg *viper.Viper) { func (s *Server) initNotaryConfig() {
s.mainNotaryConfig, s.sideNotaryConfig = notaryConfigs( s.mainNotaryConfig, s.sideNotaryConfig = notaryConfigs(
s.morphClient.ProbeNotary(), s.morphClient.ProbeNotary(),
!s.withoutMainNet && s.mainnetClient.ProbeNotary(), // if mainnet disabled then notary flag must be disabled too !s.withoutMainNet && s.mainnetClient.ProbeNotary(), // if mainnet disabled then notary flag must be disabled too

2
pkg/innerring/innerring.go
View file

@ -359,7 +359,7 @@ func New(ctx context.Context, log *logger.Logger, cfg *viper.Viper, errChan chan
return nil, err return nil, err
} }
server.initNotaryConfig(cfg) server.initNotaryConfig()
err = server.initContracts(cfg) err = server.initContracts(cfg)
if err != nil { if err != nil {

14
pkg/local_object_storage/blobstor/blobovniczatree/delete.go
View file

@ -42,7 +42,7 @@ func (b *Blobovniczas) Delete(ctx context.Context, prm common.DeletePrm) (res co
return res, err return res, err
} }
return b.deleteObject(ctx, blz, bPrm, prm) return b.deleteObject(ctx, blz, bPrm)
} }
activeCache := make(map[string]struct{}) activeCache := make(map[string]struct{})
@ -54,7 +54,7 @@ func (b *Blobovniczas) Delete(ctx context.Context, prm common.DeletePrm) (res co
// don't process active blobovnicza of the level twice // don't process active blobovnicza of the level twice
_, ok := activeCache[dirPath] _, ok := activeCache[dirPath]
res, err = b.deleteObjectFromLevel(ctx, bPrm, p, !ok, prm) res, err = b.deleteObjectFromLevel(ctx, bPrm, p, !ok)
if err != nil { if err != nil {
if !blobovnicza.IsErrNotFound(err) { if !blobovnicza.IsErrNotFound(err) {
b.log.Debug(logs.BlobovniczatreeCouldNotRemoveObjectFromLevel, b.log.Debug(logs.BlobovniczatreeCouldNotRemoveObjectFromLevel,
@ -85,7 +85,7 @@ func (b *Blobovniczas) Delete(ctx context.Context, prm common.DeletePrm) (res co
// tries to delete object from particular blobovnicza. // tries to delete object from particular blobovnicza.
// //
// returns no error if object was removed from some blobovnicza of the same level. // returns no error if object was removed from some blobovnicza of the same level.
func (b *Blobovniczas) deleteObjectFromLevel(ctx context.Context, prm blobovnicza.DeletePrm, blzPath string, tryActive bool, dp common.DeletePrm) (common.DeleteRes, error) { func (b *Blobovniczas) deleteObjectFromLevel(ctx context.Context, prm blobovnicza.DeletePrm, blzPath string, tryActive bool) (common.DeleteRes, error) {
lvlPath := filepath.Dir(blzPath) lvlPath := filepath.Dir(blzPath)
// try to remove from blobovnicza if it is opened // try to remove from blobovnicza if it is opened
@ -93,7 +93,7 @@ func (b *Blobovniczas) deleteObjectFromLevel(ctx context.Context, prm blobovnicz
v, ok := b.opened.Get(blzPath) v, ok := b.opened.Get(blzPath)
b.lruMtx.Unlock() b.lruMtx.Unlock()
if ok { if ok {
if res, err := b.deleteObject(ctx, v, prm, dp); err == nil { if res, err := b.deleteObject(ctx, v, prm); err == nil {
return res, err return res, err
} else if !blobovnicza.IsErrNotFound(err) { } else if !blobovnicza.IsErrNotFound(err) {
b.log.Debug(logs.BlobovniczatreeCouldNotRemoveObjectFromOpenedBlobovnicza, b.log.Debug(logs.BlobovniczatreeCouldNotRemoveObjectFromOpenedBlobovnicza,
@ -112,7 +112,7 @@ func (b *Blobovniczas) deleteObjectFromLevel(ctx context.Context, prm blobovnicz
b.activeMtx.RUnlock() b.activeMtx.RUnlock()
if ok && tryActive { if ok && tryActive {
if res, err := b.deleteObject(ctx, active.blz, prm, dp); err == nil { if res, err := b.deleteObject(ctx, active.blz, prm); err == nil {
return res, err return res, err
} else if !blobovnicza.IsErrNotFound(err) { } else if !blobovnicza.IsErrNotFound(err) {
b.log.Debug(logs.BlobovniczatreeCouldNotRemoveObjectFromActiveBlobovnicza, b.log.Debug(logs.BlobovniczatreeCouldNotRemoveObjectFromActiveBlobovnicza,
@ -137,11 +137,11 @@ func (b *Blobovniczas) deleteObjectFromLevel(ctx context.Context, prm blobovnicz
return common.DeleteRes{}, err return common.DeleteRes{}, err
} }
return b.deleteObject(ctx, blz, prm, dp) return b.deleteObject(ctx, blz, prm)
} }
// removes object from blobovnicza and returns common.DeleteRes. // removes object from blobovnicza and returns common.DeleteRes.
func (b *Blobovniczas) deleteObject(ctx context.Context, blz *blobovnicza.Blobovnicza, prm blobovnicza.DeletePrm, dp common.DeletePrm) (common.DeleteRes, error) { func (b *Blobovniczas) deleteObject(ctx context.Context, blz *blobovnicza.Blobovnicza, prm blobovnicza.DeletePrm) (common.DeleteRes, error) {
_, err := blz.Delete(ctx, prm) _, err := blz.Delete(ctx, prm)
return common.DeleteRes{}, err return common.DeleteRes{}, err
} }

2
pkg/local_object_storage/blobstor/fstree/fstree.go
View file

@ -468,6 +468,6 @@ func (t *FSTree) SetCompressor(cc *compression.Config) {
} }
// SetReportErrorFunc implements common.Storage. // SetReportErrorFunc implements common.Storage.
func (t *FSTree) SetReportErrorFunc(f func(string, error)) { func (t *FSTree) SetReportErrorFunc(_ func(string, error)) {
// Do nothing, FSTree can encounter only one error which is returned. // Do nothing, FSTree can encounter only one error which is returned.
} }

2
pkg/network/cache/multi.go vendored
View file

@ -277,7 +277,7 @@ func (x *multiClient) ObjectSearchInit(ctx context.Context, p client.PrmObjectSe
return return
} }
func (x *multiClient) ExecRaw(f func(client *rawclient.Client) error) error { func (x *multiClient) ExecRaw(func(client *rawclient.Client) error) error {
panic("multiClient.ExecRaw() must not be called") panic("multiClient.ExecRaw() must not be called")
} }

2
pkg/services/accounting/morph/executor.go
View file

@ -21,7 +21,7 @@ func NewExecutor(client *balance.Client) accountingSvc.ServiceExecutor {
} }
} }
func (s *morphExecutor) Balance(ctx context.Context, body *accounting.BalanceRequestBody) (*accounting.BalanceResponseBody, error) { func (s *morphExecutor) Balance(_ context.Context, body *accounting.BalanceRequestBody) (*accounting.BalanceResponseBody, error) {
idV2 := body.GetOwnerID() idV2 := body.GetOwnerID()
if idV2 == nil { if idV2 == nil {
return nil, errors.New("missing account") return nil, errors.New("missing account")

8
pkg/services/container/morph/executor.go
View file

@ -136,7 +136,7 @@ func (s *morphExecutor) Delete(_ context.Context, tokV2 *sessionV2.Token, body *
return new(container.DeleteResponseBody), nil return new(container.DeleteResponseBody), nil
} }
func (s *morphExecutor) Get(ctx context.Context, body *container.GetRequestBody) (*container.GetResponseBody, error) { func (s *morphExecutor) Get(_ context.Context, body *container.GetRequestBody) (*container.GetResponseBody, error) {
idV2 := body.GetContainerID() idV2 := body.GetContainerID()
if idV2 == nil { if idV2 == nil {
return nil, errors.New("missing container ID") return nil, errors.New("missing container ID")
@ -176,7 +176,7 @@ func (s *morphExecutor) Get(ctx context.Context, body *container.GetRequestBody)
return res, nil return res, nil
} }
func (s *morphExecutor) List(ctx context.Context, body *container.ListRequestBody) (*container.ListResponseBody, error) { func (s *morphExecutor) List(_ context.Context, body *container.ListRequestBody) (*container.ListResponseBody, error) {
idV2 := body.GetOwnerID() idV2 := body.GetOwnerID()
if idV2 == nil { if idV2 == nil {
return nil, fmt.Errorf("missing user ID") return nil, fmt.Errorf("missing user ID")
@ -205,7 +205,7 @@ func (s *morphExecutor) List(ctx context.Context, body *container.ListRequestBod
return res, nil return res, nil
} }
func (s *morphExecutor) SetExtendedACL(ctx context.Context, tokV2 *sessionV2.Token, body *container.SetExtendedACLRequestBody) (*container.SetExtendedACLResponseBody, error) { func (s *morphExecutor) SetExtendedACL(_ context.Context, tokV2 *sessionV2.Token, body *container.SetExtendedACLRequestBody) (*container.SetExtendedACLResponseBody, error) {
sigV2 := body.GetSignature() sigV2 := body.GetSignature()
if sigV2 == nil { if sigV2 == nil {
// TODO(@cthulhu-rider): #1387 use "const" error // TODO(@cthulhu-rider): #1387 use "const" error
@ -238,7 +238,7 @@ func (s *morphExecutor) SetExtendedACL(ctx context.Context, tokV2 *sessionV2.Tok
return new(container.SetExtendedACLResponseBody), nil return new(container.SetExtendedACLResponseBody), nil
} }
func (s *morphExecutor) GetExtendedACL(ctx context.Context, body *container.GetExtendedACLRequestBody) (*container.GetExtendedACLResponseBody, error) { func (s *morphExecutor) GetExtendedACL(_ context.Context, body *container.GetExtendedACLRequestBody) (*container.GetExtendedACLResponseBody, error) {
idV2 := body.GetContainerID() idV2 := body.GetContainerID()
if idV2 == nil { if idV2 == nil {
return nil, errors.New("missing container ID") return nil, errors.New("missing container ID")

2
pkg/services/control/server/set_netmap_status.go
View file

@ -11,7 +11,7 @@ import (
// SetNetmapStatus sets node status in FrostFS network. // SetNetmapStatus sets node status in FrostFS network.
// //
// If request is unsigned or signed by disallowed key, permission error returns. // If request is unsigned or signed by disallowed key, permission error returns.
func (s *Server) SetNetmapStatus(ctx context.Context, req *control.SetNetmapStatusRequest) (*control.SetNetmapStatusResponse, error) { func (s *Server) SetNetmapStatus(_ context.Context, req *control.SetNetmapStatusRequest) (*control.SetNetmapStatusResponse, error) {
// verify request // verify request
if err := s.isValidRequest(req); err != nil { if err := s.isValidRequest(req); err != nil {
return nil, status.Error(codes.PermissionDenied, err.Error()) return nil, status.Error(codes.PermissionDenied, err.Error())

2
pkg/services/netmap/executor.go
View file

@ -129,7 +129,7 @@ func (s *executorSvc) NetworkInfo(
return resp, nil return resp, nil
} }
func (s *executorSvc) Snapshot(_ context.Context, req *netmap.SnapshotRequest) (*netmap.SnapshotResponse, error) { func (s *executorSvc) Snapshot(_ context.Context, _ *netmap.SnapshotRequest) (*netmap.SnapshotResponse, error) {
var nm netmap.NetMap var nm netmap.NetMap
err := s.state.ReadCurrentNetMap(&nm) err := s.state.ReadCurrentNetMap(&nm)

2
pkg/services/object_manager/placement/netmap.go
View file

@ -47,7 +47,7 @@ func NewNetworkMapSourceBuilder(nmSrc netmap.Source) Builder {
} }
} }
func (s *netMapSrc) GetNetMap(diff uint64) (*netmapSDK.NetMap, error) { func (s *netMapSrc) GetNetMap(_ uint64) (*netmapSDK.NetMap, error) {
return s.nm, nil return s.nm, nil
} }

2
pkg/services/session/storage/persistent/executor.go
View file

@ -17,7 +17,7 @@ import (
// encrypts private keys if storage has been configured so). // encrypts private keys if storage has been configured so).
// Returns response that is filled with just created token's // Returns response that is filled with just created token's
// ID and public key for it. // ID and public key for it.
func (s *TokenStore) Create(ctx context.Context, body *session.CreateRequestBody) (*session.CreateResponseBody, error) { func (s *TokenStore) Create(_ context.Context, body *session.CreateRequestBody) (*session.CreateResponseBody, error) {
idV2 := body.GetOwnerID() idV2 := body.GetOwnerID()
if idV2 == nil { if idV2 == nil {
return nil, errors.New("missing owner") return nil, errors.New("missing owner")

2
pkg/services/session/storage/temporary/executor.go
View file

@ -12,7 +12,7 @@ import (
"github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/crypto/keys"
) )
func (s *TokenStore) Create(ctx context.Context, body *session.CreateRequestBody) (*session.CreateResponseBody, error) { func (s *TokenStore) Create(_ context.Context, body *session.CreateRequestBody) (*session.CreateResponseBody, error) {
idV2 := body.GetOwnerID() idV2 := body.GetOwnerID()
if idV2 == nil { if idV2 == nil {
return nil, errors.New("missing owner") return nil, errors.New("missing owner")

6
pkg/services/tree/service.go
View file

@ -455,7 +455,7 @@ func getSubTree(ctx context.Context, srv TreeService_GetSubTreeServer, cid cidSD
} }
// Apply locally applies operation from the remote node to the tree. // Apply locally applies operation from the remote node to the tree.
func (s *Service) Apply(ctx context.Context, req *ApplyRequest) (*ApplyResponse, error) { func (s *Service) Apply(_ context.Context, req *ApplyRequest) (*ApplyResponse, error) {
err := verifyMessage(req) err := verifyMessage(req)
if err != nil { if err != nil {
return nil, err return nil, err
@ -468,7 +468,7 @@ func (s *Service) Apply(ctx context.Context, req *ApplyRequest) (*ApplyResponse,
key := req.GetSignature().GetKey() key := req.GetSignature().GetKey()
_, pos, _, err := s.getContainerInfo(ctx, cid, key) _, pos, _, err := s.getContainerInfo(cid, key)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -623,7 +623,7 @@ func metaToProto(arr []pilorama.KeyValue) []*KeyValue {
// getContainerInfo returns the list of container nodes, position in the container for the node // getContainerInfo returns the list of container nodes, position in the container for the node
// with pub key and total amount of nodes in all replicas. // with pub key and total amount of nodes in all replicas.
func (s *Service) getContainerInfo(ctx context.Context, cid cidSDK.ID, pub []byte) ([]netmapSDK.NodeInfo, int, int, error) { func (s *Service) getContainerInfo(cid cidSDK.ID, pub []byte) ([]netmapSDK.NodeInfo, int, int, error) {
cntNodes, _, err := s.getContainerNodes(cid) cntNodes, _, err := s.getContainerNodes(cid)
if err != nil { if err != nil {
return nil, 0, 0, err return nil, 0, 0, err