From 476528361e0c9dadf4d18267525f05195f08bb15 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Sat, 29 Jan 2022 16:36:29 +0300 Subject: [PATCH] [#1023] *: fix linter errors Signed-off-by: Evgenii Stratonikov --- cmd/neofs-adm/internal/modules/morph/initialize_nns.go | 1 - cmd/neofs-node/config.go | 5 +---- pkg/innerring/innerring.go | 2 -- .../processors/netmap/nodevalidation/locode/util.go | 4 ---- pkg/morph/client/client.go | 2 -- pkg/morph/client/constructor.go | 3 --- pkg/morph/client/subnet/client.go | 2 -- 7 files changed, 1 insertion(+), 18 deletions(-) diff --git a/cmd/neofs-adm/internal/modules/morph/initialize_nns.go b/cmd/neofs-adm/internal/modules/morph/initialize_nns.go index a70961b53..02e2ea001 100644 --- a/cmd/neofs-adm/internal/modules/morph/initialize_nns.go +++ b/cmd/neofs-adm/internal/modules/morph/initialize_nns.go @@ -21,7 +21,6 @@ import ( ) const defaultNameServiceDomainPrice = 10_0000_0000 -const defaultNameServiceSysfee = 4000_0000 const defaultRegisterSysfee = 10_0000_0000 + defaultNameServiceDomainPrice func (c *initializeContext) setNNS() error { diff --git a/cmd/neofs-node/config.go b/cmd/neofs-node/config.go index 6f1738527..5002f4637 100644 --- a/cmd/neofs-node/config.go +++ b/cmd/neofs-node/config.go @@ -8,7 +8,6 @@ import ( "time" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" neogoutil "github.com/nspcc-dev/neo-go/pkg/util" netmapV2 "github.com/nspcc-dev/neofs-api-go/v2/netmap" "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" @@ -132,9 +131,7 @@ type cfgGRPC struct { type cfgMorph struct { client *client.Client - notaryEnabled bool - notaryDepositAmount fixedn.Fixed8 - notaryDepositDuration uint32 + notaryEnabled bool disableCache bool diff --git a/pkg/innerring/innerring.go b/pkg/innerring/innerring.go index 4d25b542c..dc2bbf488 100644 --- a/pkg/innerring/innerring.go +++ b/pkg/innerring/innerring.go @@ -12,7 +12,6 @@ import ( "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" - "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neofs-node/pkg/innerring/config" "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/alphabet" "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/audit" @@ -134,7 +133,6 @@ type ( cfg *viper.Viper key *keys.PrivateKey name string - gas util.Uint160 sgn *transaction.Signer from uint32 // block height } diff --git a/pkg/innerring/processors/netmap/nodevalidation/locode/util.go b/pkg/innerring/processors/netmap/nodevalidation/locode/util.go index 40d81601f..efbff4d8a 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/locode/util.go +++ b/pkg/innerring/processors/netmap/nodevalidation/locode/util.go @@ -13,10 +13,6 @@ func countryValue(r Record) string { return r.CountryName() } -func locationCodeValue(r Record) string { - return r.LocationCode().String() -} - func locationValue(r Record) string { return r.LocationName() } diff --git a/pkg/morph/client/client.go b/pkg/morph/client/client.go index 04f14aecc..358565434 100644 --- a/pkg/morph/client/client.go +++ b/pkg/morph/client/client.go @@ -85,8 +85,6 @@ func (e *notHaltStateError) Error() string { var errEmptyInvocationScript = errors.New("got empty invocation script from neo node") -var errScriptDecode = errors.New("could not decode invocation script from neo node") - // implementation of error interface for NeoFS-specific errors. type neofsError struct { err error diff --git a/pkg/morph/client/constructor.go b/pkg/morph/client/constructor.go index 3ad89d556..d1c6e13c1 100644 --- a/pkg/morph/client/constructor.go +++ b/pkg/morph/client/constructor.go @@ -7,7 +7,6 @@ import ( "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/rpc/client" - "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/wallet" "github.com/nspcc-dev/neofs-node/pkg/util/logger" "go.uber.org/zap" @@ -24,8 +23,6 @@ type cfg struct { logger *logger.Logger // logging component - gas util.Uint160 // native gas script-hash - waitInterval time.Duration signer *transaction.Signer diff --git a/pkg/morph/client/subnet/client.go b/pkg/morph/client/subnet/client.go index bbd10dd09..85310092c 100644 --- a/pkg/morph/client/subnet/client.go +++ b/pkg/morph/client/subnet/client.go @@ -48,8 +48,6 @@ const ( // NotaryNonAlphabet makes client to not use its internal key for signing the notary requests. NotaryNonAlphabet - - lastMode ) // SetMode makes client to work with non-notary sidechain.