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

[#1401] services/tree: Marshal public key once

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-05-26 15:40:44 +03:00
parent 86c6c24b86
commit d244b2658a
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/services/tree/options.go
View file

@ -3,6 +3,7 @@ package tree
import ( import (
"crypto/ecdsa" "crypto/ecdsa"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
"github.com/nspcc-dev/neofs-node/pkg/core/container" "github.com/nspcc-dev/neofs-node/pkg/core/container"
"github.com/nspcc-dev/neofs-node/pkg/core/netmap" "github.com/nspcc-dev/neofs-node/pkg/core/netmap"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama"
@ -12,6 +13,7 @@ import (
type cfg struct { type cfg struct {
log *zap.Logger log *zap.Logger
key *ecdsa.PrivateKey key *ecdsa.PrivateKey
rawPub []byte
nmSource netmap.Source nmSource netmap.Source
cnrSource container.Source cnrSource container.Source
forest pilorama.Forest forest pilorama.Forest
@ -41,6 +43,7 @@ func WithNetmapSource(src netmap.Source) Option {
func WithPrivateKey(key *ecdsa.PrivateKey) Option { func WithPrivateKey(key *ecdsa.PrivateKey) Option {
return func(c *cfg) { return func(c *cfg) {
c.key = key c.key = key
c.rawPub = (*keys.PublicKey)(&key.PublicKey).Bytes()
} }
} }

4
pkg/services/tree/redirect.go
View file

@ -6,7 +6,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
"github.com/nspcc-dev/neofs-node/pkg/network" "github.com/nspcc-dev/neofs-node/pkg/network"
cidSDK "github.com/nspcc-dev/neofs-sdk-go/container/id" cidSDK "github.com/nspcc-dev/neofs-sdk-go/container/id"
"go.uber.org/zap" "go.uber.org/zap"
@ -24,9 +23,8 @@ func (s *Service) forEachNode(ctx context.Context, cid cidSDK.ID, f func(c TreeS
return fmt.Errorf("can't get container nodes for %s: %w", cid, err) return fmt.Errorf("can't get container nodes for %s: %w", cid, err)
} }
rawPub := (*keys.PublicKey)(&s.key.PublicKey).Bytes()
for _, n := range cntNodes { for _, n := range cntNodes {
if bytes.Equal(n.PublicKey(), rawPub) { if bytes.Equal(n.PublicKey(), s.rawPub) {
return nil return nil
} }
} }

8
pkg/services/tree/replicator.go
View file

@ -8,7 +8,6 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
clientcore "github.com/nspcc-dev/neofs-node/pkg/core/client" clientcore "github.com/nspcc-dev/neofs-node/pkg/core/client"
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama"
"github.com/nspcc-dev/neofs-node/pkg/network" "github.com/nspcc-dev/neofs-node/pkg/network"
@ -31,7 +30,6 @@ const (
) )
func (s *Service) replicateLoop(ctx context.Context) { func (s *Service) replicateLoop(ctx context.Context) {
rawKey := (*keys.PublicKey)(&s.key.PublicKey).Bytes()
for { for {
select { select {
case <-s.closeCh: case <-s.closeCh:
@ -39,7 +37,7 @@ func (s *Service) replicateLoop(ctx context.Context) {
return return
case op := <-s.replicateCh: case op := <-s.replicateCh:
ctx, cancel := context.WithTimeout(ctx, defaultReplicatorTimeout) ctx, cancel := context.WithTimeout(ctx, defaultReplicatorTimeout)
err := s.replicate(ctx, rawKey, op) err := s.replicate(ctx, op)
cancel() cancel()
if err != nil { if err != nil {
@ -52,7 +50,7 @@ func (s *Service) replicateLoop(ctx context.Context) {
} }
} }
func (s *Service) replicate(ctx context.Context, rawKey []byte, op movePair) error { func (s *Service) replicate(ctx context.Context, op movePair) error {
req := newApplyRequest(&op) req := newApplyRequest(&op)
err := signMessage(req, s.key) err := signMessage(req, s.key)
if err != nil { if err != nil {
@ -66,7 +64,7 @@ func (s *Service) replicate(ctx context.Context, rawKey []byte, op movePair) err
var node clientcore.NodeInfo var node clientcore.NodeInfo
for _, n := range nodes { for _, n := range nodes {
if bytes.Equal(n.PublicKey(), rawKey) { if bytes.Equal(n.PublicKey(), s.rawPub) {
continue continue
} }