realloc/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Releases Packages Activity

[#625] client/netmap: remove intermediate wrapper

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-01-31 14:58:55 +03:00 • committed by Alex Vanin
parent 8c5c3ac9e8
commit 97d18bc515
36 changed files with 511 additions and 1011 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/innerring/processors/alphabet/processor.go
View file

@ -6,7 +6,7 @@ import (
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/nspcc-dev/neofs-node/pkg/morph/client"
nmWrapper "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper"
nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
"github.com/panjf2000/ants/v2"
"go.uber.org/zap"
@ -35,7 +35,7 @@ type (
log *zap.Logger
pool *ants.Pool
alphabetContracts Contracts
netmapClient *nmWrapper.Wrapper
netmapClient *nmClient.Client
morphClient *client.Client
irList Indexer
storageEmission uint64
@ -46,7 +46,7 @@ type (
Log *zap.Logger
PoolSize int
AlphabetContracts Contracts
NetmapClient *nmWrapper.Wrapper
NetmapClient *nmClient.Client
MorphClient *client.Client
IRList Indexer
StorageEmission uint64

6
pkg/innerring/processors/audit/processor.go
View file

@ -9,7 +9,7 @@ import (
"github.com/nspcc-dev/neofs-node/pkg/core/client"
wrapContainer "github.com/nspcc-dev/neofs-node/pkg/morph/client/container/wrapper"
wrapNetmap "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper"
nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
"github.com/nspcc-dev/neofs-node/pkg/services/audit"
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
@ -42,7 +42,7 @@ type (
searchTimeout time.Duration
containerClient *wrapContainer.Wrapper
netmapClient *wrapNetmap.Wrapper
netmapClient *nmClient.Client
taskManager TaskManager
reporter audit.Reporter
@ -52,7 +52,7 @@ type (
// Params of the processor constructor.
Params struct {
Log *zap.Logger
NetmapClient *wrapNetmap.Wrapper
NetmapClient *nmClient.Client
ContainerClient *wrapContainer.Wrapper
IRList Indexer
SGSource SGSource

4
pkg/innerring/processors/governance/process_update.go
View file

@ -10,7 +10,7 @@ import (
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/nspcc-dev/neofs-node/pkg/morph/client"
neofscontract "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofs"
"github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper"
nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap"
"go.uber.org/zap"
)
@ -86,7 +86,7 @@ func (gp *Processor) processAlphabetSync(txHash util.Uint256) {
)
if gp.notaryDisabled {
updPrm := wrapper.UpdateIRPrm{}
updPrm := nmClient.UpdateIRPrm{}
updPrm.SetKeys(newInnerRing)
updPrm.SetHash(txHash)

6
pkg/innerring/processors/governance/processor.go
View file

@ -9,7 +9,7 @@ import (
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/nspcc-dev/neofs-node/pkg/morph/client"
neofscontract "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofs"
nmWrapper "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper"
nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
"github.com/nspcc-dev/neofs-node/pkg/morph/event/rolemanagement"
"github.com/panjf2000/ants/v2"
@ -58,7 +58,7 @@ type (
log *zap.Logger
pool *ants.Pool
neofsClient *neofscontract.Client
netmapClient *nmWrapper.Wrapper
netmapClient *nmClient.Client
alphabetState AlphabetState
epochState EpochState
@ -85,7 +85,7 @@ type (
MorphClient *client.Client
MainnetClient *client.Client
NeoFSClient *neofscontract.Client
NetmapClient *nmWrapper.Wrapper
NetmapClient *nmClient.Client
NotaryDisabled bool
}

4
pkg/innerring/processors/neofs/process_config.go
View file

@ -1,7 +1,7 @@
package neofs
import (
"github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper"
nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap"
neofsEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/neofs"
"go.uber.org/zap"
)
@ -14,7 +14,7 @@ func (np *Processor) processConfig(config *neofsEvent.Config) {
return
}
prm := wrapper.SetConfigPrm{}
prm := nmClient.SetConfigPrm{}
prm.SetID(config.ID())
prm.SetKey(config.Key())

6
pkg/innerring/processors/neofs/processor.go
View file

@ -11,7 +11,7 @@ import (
"github.com/nspcc-dev/neofs-node/pkg/morph/client"
"github.com/nspcc-dev/neofs-node/pkg/morph/client/balance"
"github.com/nspcc-dev/neofs-node/pkg/morph/client/neofsid"
nmWrapper "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper"
nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
neofsEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/neofs"
"github.com/panjf2000/ants/v2"
@ -40,7 +40,7 @@ type (
pool *ants.Pool
neofsContract util.Uint160
balanceClient *balance.Client
netmapClient *nmWrapper.Wrapper
netmapClient *nmClient.Client
morphClient *client.Client
epochState EpochState
alphabetState AlphabetState
@ -61,7 +61,7 @@ type (
NeoFSContract util.Uint160
NeoFSIDClient *neofsid.Client
BalanceClient *balance.Client
NetmapClient *nmWrapper.Wrapper
NetmapClient *nmClient.Client
MorphClient *client.Client
EpochState EpochState
AlphabetState AlphabetState

2
pkg/innerring/processors/netmap/process_cleanup.go
View file

@ -2,7 +2,7 @@ package netmap
import (
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper"
netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap"
"github.com/nspcc-dev/neofs-sdk-go/netmap"
"go.uber.org/zap"
)

2
pkg/innerring/processors/netmap/process_peers.go
View file

@ -6,7 +6,7 @@ import (
"sort"
"strings"
netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper"
netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap"
netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap"
subnetEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/subnet"
"github.com/nspcc-dev/neofs-sdk-go/netmap"

6
pkg/innerring/processors/netmap/processor.go
View file

@ -7,7 +7,7 @@ import (
"github.com/nspcc-dev/neo-go/pkg/core/mempoolevent"
"github.com/nspcc-dev/neo-go/pkg/util"
container "github.com/nspcc-dev/neofs-node/pkg/morph/client/container/wrapper"
nmWrapper "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap/wrapper"
nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap"
subnetEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/subnet"
@ -59,7 +59,7 @@ type (
epochState EpochState
alphabetState AlphabetState
netmapClient *nmWrapper.Wrapper
netmapClient *nmClient.Client
containerWrp *container.Wrapper
subnetContract util.Uint160
@ -80,7 +80,7 @@ type (
Params struct {
Log *zap.Logger
PoolSize int
NetmapClient *nmWrapper.Wrapper
NetmapClient *nmClient.Client
EpochTimer EpochTimerReseter
EpochState EpochState
AlphabetState AlphabetState