george.bartolomey/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

Move to frostfs-node

Browse source 
Signed-off-by: Pavel Karpy <p.karpy@yadro.com>
This commit is contained in:
Pavel Karpy 2022-12-23 20:35:35 +03:00 • committed by Stanislav Bogatyrev
parent 42554a9298
commit 923f84722a
934 changed files with 3470 additions and 3451 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/innerring/processors/alphabet/handlers.go
View file

@ -1,8 +1,8 @@
package alphabet
import (
"github.com/nspcc-dev/neofs-node/pkg/innerring/timers"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/timers"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
"go.uber.org/zap"
)

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

@ -4,11 +4,11 @@ import (
"errors"
"fmt"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client"
nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
"github.com/TrueCloudLab/frostfs-node/pkg/util/logger"
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/nspcc-dev/neofs-node/pkg/morph/client"
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/util/logger"
"github.com/panjf2000/ants/v2"
"go.uber.org/zap"
)
@ -54,7 +54,7 @@ type (
}
)
// New creates a neofs mainnet contract processor instance.
// New creates a frostfs mainnet contract processor instance.
func New(p *Params) (*Processor, error) {
switch {
case p.Log == nil:
@ -69,7 +69,7 @@ func New(p *Params) (*Processor, error) {
pool, err := ants.NewPool(p.PoolSize, ants.WithNonblocking(true))
if err != nil {
return nil, fmt.Errorf("ir/neofs: can't create worker pool: %w", err)
return nil, fmt.Errorf("ir/frostfs: can't create worker pool: %w", err)
}
return &Processor{

2
pkg/innerring/processors/audit/handlers.go
View file

@ -1,7 +1,7 @@
package audit
import (
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
"go.uber.org/zap"
)

20
pkg/innerring/processors/audit/process.go
View file

@ -4,16 +4,16 @@ import (
"context"
"crypto/sha256"
clientcore "github.com/nspcc-dev/neofs-node/pkg/core/client"
netmapcore "github.com/nspcc-dev/neofs-node/pkg/core/netmap"
"github.com/nspcc-dev/neofs-node/pkg/core/storagegroup"
cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container"
"github.com/nspcc-dev/neofs-node/pkg/services/audit"
"github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement"
"github.com/nspcc-dev/neofs-node/pkg/util/rand"
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
"github.com/nspcc-dev/neofs-sdk-go/netmap"
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client"
netmapcore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap"
"github.com/TrueCloudLab/frostfs-node/pkg/core/storagegroup"
cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container"
"github.com/TrueCloudLab/frostfs-node/pkg/services/audit"
"github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement"
"github.com/TrueCloudLab/frostfs-node/pkg/util/rand"
cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id"
"go.uber.org/zap"
)

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

@ -7,12 +7,12 @@ import (
"fmt"
"time"
"github.com/nspcc-dev/neofs-node/pkg/core/storagegroup"
cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container"
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"
"github.com/nspcc-dev/neofs-node/pkg/util/logger"
"github.com/TrueCloudLab/frostfs-node/pkg/core/storagegroup"
cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container"
nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
"github.com/TrueCloudLab/frostfs-node/pkg/services/audit"
"github.com/TrueCloudLab/frostfs-node/pkg/util/logger"
"github.com/panjf2000/ants/v2"
)

2
pkg/innerring/processors/audit/scheduler.go
View file

@ -6,7 +6,7 @@ import (
"sort"
"strings"
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
"go.uber.org/zap"
)

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

@ -3,9 +3,9 @@ package audit_test
import (
"testing"
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/audit"
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/audit"
cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test"
"github.com/stretchr/testify/require"
)

4
pkg/innerring/processors/balance/handlers.go
View file

@ -3,8 +3,8 @@ package balance
import (
"encoding/hex"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
balanceEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/balance"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
balanceEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/balance"
"go.uber.org/zap"
)

4
pkg/innerring/processors/balance/process_assets.go
View file

@ -1,8 +1,8 @@
package balance
import (
neofscontract "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofs"
balanceEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/balance"
neofscontract "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofs"
balanceEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/balance"
"go.uber.org/zap"
)

12
pkg/innerring/processors/balance/processor.go
View file

@ -4,11 +4,11 @@ import (
"errors"
"fmt"
frostfscontract "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofs"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
balanceEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/balance"
"github.com/TrueCloudLab/frostfs-node/pkg/util/logger"
"github.com/nspcc-dev/neo-go/pkg/util"
neofscontract "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofs"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
balanceEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/balance"
"github.com/nspcc-dev/neofs-node/pkg/util/logger"
"github.com/panjf2000/ants/v2"
"go.uber.org/zap"
)
@ -28,7 +28,7 @@ type (
Processor struct {
log *logger.Logger
pool *ants.Pool
neofsClient *neofscontract.Client
neofsClient *frostfscontract.Client
balanceSC util.Uint160
alphabetState AlphabetState
converter PrecisionConverter
@ -38,7 +38,7 @@ type (
Params struct {
Log *logger.Logger
PoolSize int
NeoFSClient *neofscontract.Client
NeoFSClient *frostfscontract.Client
BalanceSC util.Uint160
AlphabetState AlphabetState
Converter PrecisionConverter

14
pkg/innerring/processors/container/common.go
View file

@ -5,11 +5,11 @@ import (
"errors"
"fmt"
"github.com/nspcc-dev/neofs-node/pkg/morph/client/neofsid"
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
neofsecdsa "github.com/nspcc-dev/neofs-sdk-go/crypto/ecdsa"
"github.com/nspcc-dev/neofs-sdk-go/session"
"github.com/nspcc-dev/neofs-sdk-go/user"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid"
cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa"
"github.com/TrueCloudLab/frostfs-sdk-go/session"
"github.com/TrueCloudLab/frostfs-sdk-go/user"
)
var (
@ -48,7 +48,7 @@ type signatureVerificationData struct {
// - session is "alive"
func (cp *Processor) verifySignature(v signatureVerificationData) error {
var err error
var key neofsecdsa.PublicKeyRFC6979
var key frostfsecdsa.PublicKeyRFC6979
keyProvided := v.binPublicKey != nil
if keyProvided {
@ -122,7 +122,7 @@ func (cp *Processor) verifySignature(v signatureVerificationData) error {
}
for i := range ownerKeys {
if (*neofsecdsa.PublicKeyRFC6979)(ownerKeys[i]).Verify(v.signedData, v.signature) {
if (*frostfsecdsa.PublicKeyRFC6979)(ownerKeys[i]).Verify(v.signedData, v.signature) {
return nil
}
}

4
pkg/innerring/processors/container/handlers.go
View file

@ -3,9 +3,9 @@ package container
import (
"crypto/sha256"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
containerEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container"
"github.com/mr-tron/base58"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
containerEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/container"
"go.uber.org/zap"
)

16
pkg/innerring/processors/container/process_container.go
View file

@ -3,15 +3,15 @@ package container
import (
"fmt"
cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container"
morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
containerEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container"
containerSDK "github.com/TrueCloudLab/frostfs-sdk-go/container"
cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
"github.com/TrueCloudLab/frostfs-sdk-go/session"
subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id"
"github.com/nspcc-dev/neo-go/pkg/network/payload"
cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container"
morphsubnet "github.com/nspcc-dev/neofs-node/pkg/morph/client/subnet"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
containerEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/container"
containerSDK "github.com/nspcc-dev/neofs-sdk-go/container"
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
"github.com/nspcc-dev/neofs-sdk-go/session"
subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id"
"go.uber.org/zap"
)

8
pkg/innerring/processors/container/process_eacl.go
View file

@ -4,10 +4,10 @@ import (
"errors"
"fmt"
cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container"
"github.com/nspcc-dev/neofs-node/pkg/morph/event/container"
"github.com/nspcc-dev/neofs-sdk-go/eacl"
"github.com/nspcc-dev/neofs-sdk-go/session"
cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container"
"github.com/TrueCloudLab/frostfs-sdk-go/eacl"
"github.com/TrueCloudLab/frostfs-sdk-go/session"
"go.uber.org/zap"
)

12
pkg/innerring/processors/container/processor.go
View file

@ -4,13 +4,13 @@ import (
"errors"
"fmt"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid"
morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
containerEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container"
"github.com/TrueCloudLab/frostfs-node/pkg/util/logger"
"github.com/nspcc-dev/neo-go/pkg/core/mempoolevent"
"github.com/nspcc-dev/neofs-node/pkg/morph/client/container"
"github.com/nspcc-dev/neofs-node/pkg/morph/client/neofsid"
morphsubnet "github.com/nspcc-dev/neofs-node/pkg/morph/client/subnet"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
containerEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/container"
"github.com/nspcc-dev/neofs-node/pkg/util/logger"
"github.com/panjf2000/ants/v2"
"go.uber.org/zap"
)

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

@ -1,11 +1,11 @@
package governance
import (
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event/rolemanagement"
"github.com/nspcc-dev/neo-go/pkg/core/native"
"github.com/nspcc-dev/neo-go/pkg/core/native/noderoles"
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
"github.com/nspcc-dev/neofs-node/pkg/morph/event/rolemanagement"
"go.uber.org/zap"
)

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

@ -6,11 +6,11 @@ import (
"sort"
"strings"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client"
frostfscontract "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofs"
nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
"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"
nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap"
"go.uber.org/zap"
)
@ -131,14 +131,14 @@ func (gp *Processor) processAlphabetSync(txHash util.Uint256) {
id := append([]byte(alphabetUpdateIDPrefix), buf...)
prm := neofscontract.AlphabetUpdatePrm{}
prm := frostfscontract.AlphabetUpdatePrm{}
prm.SetID(id)
prm.SetPubs(newAlphabet)
err = gp.neofsClient.AlphabetUpdate(prm)
err = gp.frostfsClient.AlphabetUpdate(prm)
if err != nil {
gp.log.Error("can't update list of alphabet nodes in neofs contract",
gp.log.Error("can't update list of alphabet nodes in frostfs contract",
zap.String("error", err.Error()))
}

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

@ -4,15 +4,15 @@ import (
"errors"
"fmt"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client"
frostfscontract "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofs"
nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event/rolemanagement"
"github.com/TrueCloudLab/frostfs-node/pkg/util/logger"
"github.com/nspcc-dev/neo-go/pkg/core/native"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
"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"
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/nspcc-dev/neofs-node/pkg/util/logger"
"github.com/panjf2000/ants/v2"
)
@ -55,10 +55,10 @@ type (
// Processor of events related to governance in the network.
Processor struct {
log *logger.Logger
pool *ants.Pool
neofsClient *neofscontract.Client
netmapClient *nmClient.Client
log *logger.Logger
pool *ants.Pool
frostfsClient *frostfscontract.Client
netmapClient *nmClient.Client
alphabetState AlphabetState
epochState EpochState
@ -84,7 +84,7 @@ type (
MorphClient *client.Client
MainnetClient *client.Client
NeoFSClient *neofscontract.Client
NeoFSClient *frostfscontract.Client
NetmapClient *nmClient.Client
NotaryDisabled bool
@ -121,7 +121,7 @@ func New(p *Params) (*Processor, error) {
return &Processor{
log: p.Log,
pool: pool,
neofsClient: p.NeoFSClient,
frostfsClient: p.NeoFSClient,
netmapClient: p.NetmapClient,
alphabetState: p.AlphabetState,
epochState: p.EpochState,

30
pkg/innerring/processors/neofs/handlers.go
View file

@ -1,16 +1,16 @@
package neofs
package frostfs
import (
"encoding/hex"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
frostfsEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/neofs"
"github.com/nspcc-dev/neo-go/pkg/util/slice"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
neofsEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/neofs"
"go.uber.org/zap"
)
func (np *Processor) handleDeposit(ev event.Event) {
deposit := ev.(neofsEvent.Deposit)
deposit := ev.(frostfsEvent.Deposit)
np.log.Info("notification",
zap.String("type", "deposit"),
zap.String("id", hex.EncodeToString(slice.CopyReverse(deposit.ID()))))
@ -20,13 +20,13 @@ func (np *Processor) handleDeposit(ev event.Event) {
err := np.pool.Submit(func() { np.processDeposit(&deposit) })
if err != nil {
// there system can be moved into controlled degradation stage
np.log.Warn("neofs processor worker pool drained",
np.log.Warn("frostfs processor worker pool drained",
zap.Int("capacity", np.pool.Cap()))
}
}
func (np *Processor) handleWithdraw(ev event.Event) {
withdraw := ev.(neofsEvent.Withdraw)
withdraw := ev.(frostfsEvent.Withdraw)
np.log.Info("notification",
zap.String("type", "withdraw"),
zap.String("id", hex.EncodeToString(slice.CopyReverse(withdraw.ID()))))
@ -36,13 +36,13 @@ func (np *Processor) handleWithdraw(ev event.Event) {
err := np.pool.Submit(func() { np.processWithdraw(&withdraw) })
if err != nil {
// there system can be moved into controlled degradation stage
np.log.Warn("neofs processor worker pool drained",
np.log.Warn("frostfs processor worker pool drained",
zap.Int("capacity", np.pool.Cap()))
}
}
func (np *Processor) handleCheque(ev event.Event) {
cheque := ev.(neofsEvent.Cheque)
cheque := ev.(frostfsEvent.Cheque)
np.log.Info("notification",
zap.String("type", "cheque"),
zap.String("id", hex.EncodeToString(cheque.ID())))
@ -52,13 +52,13 @@ func (np *Processor) handleCheque(ev event.Event) {
err := np.pool.Submit(func() { np.processCheque(&cheque) })
if err != nil {
// there system can be moved into controlled degradation stage
np.log.Warn("neofs processor worker pool drained",
np.log.Warn("frostfs processor worker pool drained",
zap.Int("capacity", np.pool.Cap()))
}
}
func (np *Processor) handleConfig(ev event.Event) {
cfg := ev.(neofsEvent.Config)
cfg := ev.(frostfsEvent.Config)
np.log.Info("notification",
zap.String("type", "set config"),
zap.String("key", hex.EncodeToString(cfg.Key())),
@ -69,13 +69,13 @@ func (np *Processor) handleConfig(ev event.Event) {
err := np.pool.Submit(func() { np.processConfig(&cfg) })
if err != nil {
// there system can be moved into controlled degradation stage
np.log.Warn("neofs processor worker pool drained",
np.log.Warn("frostfs processor worker pool drained",
zap.Int("capacity", np.pool.Cap()))
}
}
func (np *Processor) handleBind(ev event.Event) {
e := ev.(neofsEvent.Bind)
e := ev.(frostfsEvent.Bind)
np.log.Info("notification",
zap.String("type", "bind"),
)
@ -85,13 +85,13 @@ func (np *Processor) handleBind(ev event.Event) {
err := np.pool.Submit(func() { np.processBind(e) })
if err != nil {
// there system can be moved into controlled degradation stage
np.log.Warn("neofs processor worker pool drained",
np.log.Warn("frostfs processor worker pool drained",
zap.Int("capacity", np.pool.Cap()))
}
}
func (np *Processor) handleUnbind(ev event.Event) {
e := ev.(neofsEvent.Unbind)
e := ev.(frostfsEvent.Unbind)
np.log.Info("notification",
zap.String("type", "unbind"),
)
@ -101,7 +101,7 @@ func (np *Processor) handleUnbind(ev event.Event) {
err := np.pool.Submit(func() { np.processBind(e) })
if err != nil {
// there system can be moved into controlled degradation stage
np.log.Warn("neofs processor worker pool drained",
np.log.Warn("frostfs processor worker pool drained",
zap.Int("capacity", np.pool.Cap()))
}
}

12
pkg/innerring/processors/neofs/process_assets.go
View file

@ -1,9 +1,9 @@
package neofs
package frostfs
import (
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance"
frostfsEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/neofs"
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/nspcc-dev/neofs-node/pkg/morph/client/balance"
neofsEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/neofs"
"go.uber.org/zap"
)
@ -14,7 +14,7 @@ const (
// Process deposit event by invoking a balance contract and sending native
// gas in the sidechain.
func (np *Processor) processDeposit(deposit *neofsEvent.Deposit) {
func (np *Processor) processDeposit(deposit *frostfsEvent.Deposit) {
if !np.alphabetState.IsAlphabet() {
np.log.Info("non alphabet mode, ignore deposit")
return
@ -79,7 +79,7 @@ func (np *Processor) processDeposit(deposit *neofsEvent.Deposit) {
}
// Process withdraw event by locking assets in the balance account.
func (np *Processor) processWithdraw(withdraw *neofsEvent.Withdraw) {
func (np *Processor) processWithdraw(withdraw *frostfsEvent.Withdraw) {
if !np.alphabetState.IsAlphabet() {
np.log.Info("non alphabet mode, ignore withdraw")
return
@ -110,7 +110,7 @@ func (np *Processor) processWithdraw(withdraw *neofsEvent.Withdraw) {
// Process cheque event by transferring assets from the lock account back to
// the reserve account.
func (np *Processor) processCheque(cheque *neofsEvent.Cheque) {
func (np *Processor) processCheque(cheque *frostfsEvent.Cheque) {
if !np.alphabetState.IsAlphabet() {
np.log.Info("non alphabet mode, ignore cheque")
return

14
pkg/innerring/processors/neofs/process_bind.go
View file

@ -1,14 +1,14 @@
package neofs
package frostfs
import (
"crypto/elliptic"
"fmt"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid"
frostfs "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/neofs"
"github.com/TrueCloudLab/frostfs-sdk-go/user"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/nspcc-dev/neofs-node/pkg/morph/client/neofsid"
"github.com/nspcc-dev/neofs-node/pkg/morph/event/neofs"
"github.com/nspcc-dev/neofs-sdk-go/user"
"go.uber.org/zap"
)
@ -28,7 +28,7 @@ func (np *Processor) processBind(e bindCommon) {
bindCommon: e,
}
_, c.bind = e.(neofs.Bind)
_, c.bind = e.(frostfs.Bind)
err := np.checkBindCommon(c)
if err != nil {
@ -95,10 +95,10 @@ func (np *Processor) approveBindCommon(e *bindCommonContext) {
var typ string
if e.bind {
typ = "bind"
err = np.neofsIDClient.AddKeys(prm)
err = np.frostfsIDClient.AddKeys(prm)
} else {
typ = "unbind"
err = np.neofsIDClient.RemoveKeys(prm)
err = np.frostfsIDClient.RemoveKeys(prm)
}
if err != nil {

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

@ -1,14 +1,14 @@
package neofs
package frostfs
import (
nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap"
neofsEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/neofs"
nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
frostfsEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/neofs"
"go.uber.org/zap"
)
// Process config event by setting configuration value from the mainchain in
// the sidechain.
func (np *Processor) processConfig(config *neofsEvent.Config) {
func (np *Processor) processConfig(config *frostfsEvent.Config) {
if !np.alphabetState.IsAlphabet() {
np.log.Info("non alphabet mode, ignore config")
return

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

@ -1,20 +1,20 @@
package neofs
package frostfs
import (
"errors"
"fmt"
"sync"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid"
nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
frostfsEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/neofs"
"github.com/TrueCloudLab/frostfs-node/pkg/util/logger"
lru "github.com/hashicorp/golang-lru"
"github.com/nspcc-dev/neo-go/pkg/encoding/fixedn"
"github.com/nspcc-dev/neo-go/pkg/util"
"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"
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/nspcc-dev/neofs-node/pkg/util/logger"
"github.com/panjf2000/ants/v2"
"go.uber.org/zap"
)
@ -35,11 +35,11 @@ type (
ToBalancePrecision(int64) int64
}
// Processor of events produced by neofs contract in main net.
// Processor of events produced by frostfs contract in main net.
Processor struct {
log *logger.Logger
pool *ants.Pool
neofsContract util.Uint160
frostfsContract util.Uint160
balanceClient *balance.Client
netmapClient *nmClient.Client
morphClient *client.Client
@ -52,7 +52,7 @@ type (
mintEmitValue fixedn.Fixed8
gasBalanceThreshold int64
neofsIDClient *neofsid.Client
frostfsIDClient *neofsid.Client
}
// Params of the processor constructor.
@ -83,37 +83,37 @@ const (
unbindNotification = "Unbind"
)
// New creates neofs mainnet contract processor instance.
// New creates frostfs mainnet contract processor instance.
func New(p *Params) (*Processor, error) {
switch {
case p.Log == nil:
return nil, errors.New("ir/neofs: logger is not set")
return nil, errors.New("ir/frostfs: logger is not set")
case p.MorphClient == nil:
return nil, errors.New("ir/neofs: neo:morph client is not set")
return nil, errors.New("ir/frostfs: neo:morph client is not set")
case p.EpochState == nil:
return nil, errors.New("ir/neofs: global state is not set")
return nil, errors.New("ir/frostfs: global state is not set")
case p.AlphabetState == nil:
return nil, errors.New("ir/neofs: global state is not set")
return nil, errors.New("ir/frostfs: global state is not set")
case p.Converter == nil:
return nil, errors.New("ir/neofs: balance precision converter is not set")
return nil, errors.New("ir/frostfs: balance precision converter is not set")
}
p.Log.Debug("neofs worker pool", zap.Int("size", p.PoolSize))
p.Log.Debug("frostfs worker pool", zap.Int("size", p.PoolSize))
pool, err := ants.NewPool(p.PoolSize, ants.WithNonblocking(true))
if err != nil {
return nil, fmt.Errorf("ir/neofs: can't create worker pool: %w", err)
return nil, fmt.Errorf("ir/frostfs: can't create worker pool: %w", err)
}
lruCache, err := lru.New(p.MintEmitCacheSize)
if err != nil {
return nil, fmt.Errorf("ir/neofs: can't create LRU cache for gas emission: %w", err)
return nil, fmt.Errorf("ir/frostfs: can't create LRU cache for gas emission: %w", err)
}
return &Processor{
log: p.Log,
pool: pool,
neofsContract: p.NeoFSContract,
frostfsContract: p.NeoFSContract,
balanceClient: p.BalanceClient,
netmapClient: p.NetmapClient,
morphClient: p.MorphClient,
@ -126,7 +126,7 @@ func New(p *Params) (*Processor, error) {
mintEmitValue: p.MintEmitValue,
gasBalanceThreshold: p.GasBalanceThreshold,
neofsIDClient: p.NeoFSIDClient,
frostfsIDClient: p.NeoFSIDClient,
}, nil
}
@ -138,36 +138,36 @@ func (np *Processor) ListenerNotificationParsers() []event.NotificationParserInf
p event.NotificationParserInfo
)
p.SetScriptHash(np.neofsContract)
p.SetScriptHash(np.frostfsContract)
// deposit event
p.SetType(event.TypeFromString(depositNotification))
p.SetParser(neofsEvent.ParseDeposit)
p.SetParser(frostfsEvent.ParseDeposit)
parsers = append(parsers, p)
// withdraw event
p.SetType(event.TypeFromString(withdrawNotification))
p.SetParser(neofsEvent.ParseWithdraw)
p.SetParser(frostfsEvent.ParseWithdraw)
parsers = append(parsers, p)
// cheque event
p.SetType(event.TypeFromString(chequeNotification))
p.SetParser(neofsEvent.ParseCheque)
p.SetParser(frostfsEvent.ParseCheque)
parsers = append(parsers, p)
// config event
p.SetType(event.TypeFromString(configNotification))
p.SetParser(neofsEvent.ParseConfig)
p.SetParser(frostfsEvent.ParseConfig)
parsers = append(parsers, p)
// bind event
p.SetType(event.TypeFromString(bindNotification))
p.SetParser(neofsEvent.ParseBind)
p.SetParser(frostfsEvent.ParseBind)
parsers = append(parsers, p)
// unbind event
p.SetType(event.TypeFromString(unbindNotification))
p.SetParser(neofsEvent.ParseUnbind)
p.SetParser(frostfsEvent.ParseUnbind)
parsers = append(parsers, p)
return parsers
@ -181,7 +181,7 @@ func (np *Processor) ListenerNotificationHandlers() []event.NotificationHandlerI
h event.NotificationHandlerInfo
)
h.SetScriptHash(np.neofsContract)
h.SetScriptHash(np.frostfsContract)
// deposit handler
h.SetType(event.TypeFromString(depositNotification))

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

@ -4,7 +4,7 @@ import (
"bytes"
"sync"
"github.com/nspcc-dev/neofs-sdk-go/netmap"
"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
)
type (

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

@ -3,8 +3,8 @@ package netmap
import (
"testing"
"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
"github.com/nspcc-dev/neofs-sdk-go/netmap"
"github.com/stretchr/testify/require"
)

8
pkg/innerring/processors/netmap/handlers.go
View file

@ -3,10 +3,10 @@ package netmap
import (
"encoding/hex"
timerEvent "github.com/nspcc-dev/neofs-node/pkg/innerring/timers"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap"
subnetevents "github.com/nspcc-dev/neofs-node/pkg/morph/event/subnet"
timerEvent "github.com/TrueCloudLab/frostfs-node/pkg/innerring/timers"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap"
subnetevents "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet"
"go.uber.org/zap"
)

4
pkg/innerring/processors/netmap/nodevalidation/locode/calls.go
View file

@ -4,8 +4,8 @@ import (
"errors"
"fmt"
"github.com/nspcc-dev/neofs-node/pkg/util/locode"
"github.com/nspcc-dev/neofs-sdk-go/netmap"
"github.com/TrueCloudLab/frostfs-node/pkg/util/locode"
"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
)
var errMissingRequiredAttr = errors.New("missing required attribute in DB record")

8
pkg/innerring/processors/netmap/nodevalidation/locode/calls_test.go
View file

@ -5,10 +5,10 @@ import (
"fmt"
"testing"
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap/nodevalidation/locode"
locodestd "github.com/nspcc-dev/neofs-node/pkg/util/locode"
locodedb "github.com/nspcc-dev/neofs-node/pkg/util/locode/db"
"github.com/nspcc-dev/neofs-sdk-go/netmap"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/locode"
locodestd "github.com/TrueCloudLab/frostfs-node/pkg/util/locode"
locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db"
"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
"github.com/stretchr/testify/require"
)

4
pkg/innerring/processors/netmap/nodevalidation/locode/deps.go
View file

@ -1,8 +1,8 @@
package locode
import (
"github.com/nspcc-dev/neofs-node/pkg/util/locode"
locodedb "github.com/nspcc-dev/neofs-node/pkg/util/locode/db"
"github.com/TrueCloudLab/frostfs-node/pkg/util/locode"
locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db"
)
// Record is an interface of read-only

4
pkg/innerring/processors/netmap/nodevalidation/maddress/calls.go
View file

@ -3,8 +3,8 @@ package maddress
import (
"fmt"
"github.com/nspcc-dev/neofs-node/pkg/network"
"github.com/nspcc-dev/neofs-sdk-go/netmap"
"github.com/TrueCloudLab/frostfs-node/pkg/network"
"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
)
// VerifyAndUpdate calls network.VerifyAddress.

4
pkg/innerring/processors/netmap/nodevalidation/state/validator.go
View file

@ -9,7 +9,7 @@ package state
import (
"errors"
"github.com/nspcc-dev/neofs-sdk-go/netmap"
"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
)
// ErrMaintenanceModeDisallowed is returned when maintenance mode is disallowed.
@ -33,7 +33,7 @@ type NetworkSettings interface {
// and currently doesn't require any additional initialization.
//
// NetMapCandidateValidator implements
// github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap.NodeValidator.
// github.com/nspcc-dev/frostfs-node/pkg/innerring/processors/netmap.NodeValidator.
type NetMapCandidateValidator struct {
netSettings NetworkSettings
}

4
pkg/innerring/processors/netmap/nodevalidation/state/validator_test.go
View file

@ -3,8 +3,8 @@ package state_test
import (
"testing"
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap/nodevalidation/state"
"github.com/nspcc-dev/neofs-sdk-go/netmap"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/state"
"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
"github.com/stretchr/testify/require"
)

6
pkg/innerring/processors/netmap/nodevalidation/subnet/calls.go
View file

@ -3,9 +3,9 @@ package subnet
import (
"fmt"
morphsubnet "github.com/nspcc-dev/neofs-node/pkg/morph/client/subnet"
"github.com/nspcc-dev/neofs-sdk-go/netmap"
subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id"
morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet"
"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id"
)
// VerifyAndUpdate calls subnet contract's `NodeAllowed` method.

2
pkg/innerring/processors/netmap/nodevalidation/subnet/validator.go
View file

@ -3,7 +3,7 @@ package subnet
import (
"errors"
morphsubnet "github.com/nspcc-dev/neofs-node/pkg/morph/client/subnet"
morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet"
)
// Validator is an utility that verifies node subnet

4
pkg/innerring/processors/netmap/nodevalidation/validator.go
View file

@ -1,8 +1,8 @@
package nodevalidation
import (
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap"
apinetmap "github.com/nspcc-dev/neofs-sdk-go/netmap"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap"
apinetmap "github.com/TrueCloudLab/frostfs-sdk-go/netmap"
)
// CompositeValidator wraps `netmap.NodeValidator`s.

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

@ -1,9 +1,9 @@
package netmap
import (
v2netmap "github.com/TrueCloudLab/frostfs-api-go/v2/netmap"
netmapclient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
v2netmap "github.com/nspcc-dev/neofs-api-go/v2/netmap"
netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap"
"go.uber.org/zap"
)
@ -27,7 +27,7 @@ func (np *Processor) processNetmapCleanupTick(ev netmapCleanupTick) {
// In notary environments we call UpdateStateIR method instead of UpdateState.
// It differs from UpdateState only by name, so we can do this in the same form.
// See https://github.com/nspcc-dev/neofs-contract/issues/225
// See https://github.com/nspcc-dev/frostfs-contract/issues/225
const methodUpdateStateNotary = "updateStateIR"
if np.notaryDisabled {

10
pkg/innerring/processors/netmap/process_epoch.go
View file

@ -1,11 +1,11 @@
package netmap
import (
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/audit"
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/governance"
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement"
cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container"
netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/audit"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/governance"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement"
cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container"
netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap"
"go.uber.org/zap"
)

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

@ -4,11 +4,11 @@ import (
"bytes"
"encoding/hex"
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"
subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id"
netmapclient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap"
subnetEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet"
"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id"
"go.uber.org/zap"
)
@ -70,7 +70,7 @@ func (np *Processor) processAddPeer(ev netmapEvent.AddPeer) {
// In notary environments we call AddPeerIR method instead of AddPeer.
// It differs from AddPeer only by name, so we can do this in the same form.
// See https://github.com/nspcc-dev/neofs-contract/issues/154.
// See https://github.com/nspcc-dev/frostfs-contract/issues/154.
const methodAddPeerNotary = "addPeerIR"
if nr := ev.NotaryRequest(); nr != nil {

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

@ -4,16 +4,16 @@ import (
"errors"
"fmt"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/state"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container"
nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap"
subnetEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet"
"github.com/TrueCloudLab/frostfs-node/pkg/util/logger"
"github.com/TrueCloudLab/frostfs-sdk-go/netmap"
"github.com/nspcc-dev/neo-go/pkg/core/mempoolevent"
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap/nodevalidation/state"
"github.com/nspcc-dev/neofs-node/pkg/morph/client/container"
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"
"github.com/nspcc-dev/neofs-node/pkg/util/logger"
"github.com/nspcc-dev/neofs-sdk-go/netmap"
"github.com/panjf2000/ants/v2"
"go.uber.org/zap"
)

6
pkg/innerring/processors/reputation/handlers.go
View file

@ -3,8 +3,8 @@ package reputation
import (
"encoding/hex"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
reputationEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/reputation"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
reputationEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/reputation"
"go.uber.org/zap"
)
@ -12,7 +12,7 @@ func (rp *Processor) handlePutReputation(ev event.Event) {
put := ev.(reputationEvent.Put)
peerID := put.PeerID()
// FIXME: #1147 do not use `ToV2` method outside neofs-api-go library
// FIXME: #1147 do not use `ToV2` method outside frostfs-api-go library
rp.log.Info("notification",
zap.String("type", "reputation put"),
zap.String("peer_id", hex.EncodeToString(peerID.PublicKey())))

10
pkg/innerring/processors/reputation/process_put.go
View file

@ -6,9 +6,9 @@ import (
"errors"
"fmt"
repClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/reputation"
reputationEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/reputation"
apireputation "github.com/nspcc-dev/neofs-sdk-go/reputation"
repClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/reputation"
reputationEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/reputation"
apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation"
"go.uber.org/zap"
)
@ -63,7 +63,7 @@ func (rp *Processor) checkManagers(e uint64, mng apireputation.PeerID, peer apir
}
for _, m := range mm {
// FIXME: #1147 do not use `ToV2` method outside neofs-api-go library
// FIXME: #1147 do not use `ToV2` method outside frostfs-api-go library
if bytes.Equal(mng.PublicKey(), m.PublicKey()) {
return nil
}
@ -90,7 +90,7 @@ func (rp *Processor) approvePutReputation(e *reputationEvent.Put) {
err = rp.reputationWrp.Put(args)
}
if err != nil {
// FIXME: #1147 do not use `ToV2` method outside neofs-api-go library
// FIXME: #1147 do not use `ToV2` method outside frostfs-api-go library
rp.log.Warn("can't send approval tx for reputation value",
zap.String("peer_id", hex.EncodeToString(id.PublicKey())),
zap.String("error", err.Error()))

10
pkg/innerring/processors/reputation/processor.go
View file

@ -4,12 +4,12 @@ import (
"errors"
"fmt"
repClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/reputation"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
reputationEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/reputation"
"github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common"
"github.com/TrueCloudLab/frostfs-node/pkg/util/logger"
"github.com/nspcc-dev/neo-go/pkg/core/mempoolevent"
repClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/reputation"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
reputationEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/reputation"
"github.com/nspcc-dev/neofs-node/pkg/services/reputation/common"
"github.com/nspcc-dev/neofs-node/pkg/util/logger"
"github.com/panjf2000/ants/v2"
"go.uber.org/zap"
)

12
pkg/innerring/processors/settlement/audit/calculate.go
View file

@ -7,13 +7,13 @@ import (
"encoding/hex"
"math/big"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common"
"github.com/TrueCloudLab/frostfs-node/pkg/util/logger"
"github.com/TrueCloudLab/frostfs-sdk-go/audit"
cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id"
"github.com/TrueCloudLab/frostfs-sdk-go/user"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/common"
"github.com/nspcc-dev/neofs-node/pkg/util/logger"
"github.com/nspcc-dev/neofs-sdk-go/audit"
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
"github.com/nspcc-dev/neofs-sdk-go/user"
"go.uber.org/zap"
)

2
pkg/innerring/processors/settlement/audit/calculator.go
View file

@ -1,7 +1,7 @@
package audit
import (
"github.com/nspcc-dev/neofs-node/pkg/util/logger"
"github.com/TrueCloudLab/frostfs-node/pkg/util/logger"
"go.uber.org/zap"
)

6
pkg/innerring/processors/settlement/audit/prm.go
View file

@ -1,9 +1,9 @@
package audit
import (
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/common"
"github.com/nspcc-dev/neofs-sdk-go/audit"
oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common"
"github.com/TrueCloudLab/frostfs-sdk-go/audit"
oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id"
)
// CalculatorPrm groups the parameters of Calculator's constructor.

4
pkg/innerring/processors/settlement/basic/collect.go
View file

@ -3,8 +3,8 @@ package basic
import (
"math/big"
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/common"
cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common"
cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container"
"go.uber.org/zap"
)

8
pkg/innerring/processors/settlement/basic/context.go
View file

@ -4,11 +4,11 @@ import (
"math/big"
"sync"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container"
"github.com/TrueCloudLab/frostfs-node/pkg/util/logger"
"github.com/TrueCloudLab/frostfs-sdk-go/user"
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/common"
"github.com/nspcc-dev/neofs-node/pkg/morph/client/container"
"github.com/nspcc-dev/neofs-node/pkg/util/logger"
"github.com/nspcc-dev/neofs-sdk-go/user"
)
type (

2
pkg/innerring/processors/settlement/basic/distribute.go
View file

@ -4,7 +4,7 @@ import (
"encoding/hex"
"math/big"
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/common"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common"
"go.uber.org/zap"
)

4
pkg/innerring/processors/settlement/calls.go
View file

@ -1,8 +1,8 @@
package settlement
import (
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
"github.com/nspcc-dev/neofs-node/pkg/util/logger"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
"github.com/TrueCloudLab/frostfs-node/pkg/util/logger"
"go.uber.org/zap"
)

4
pkg/innerring/processors/settlement/common/types.go
View file

@ -3,8 +3,8 @@ package common
import (
"math/big"
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
"github.com/nspcc-dev/neofs-sdk-go/user"
cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id"
"github.com/TrueCloudLab/frostfs-sdk-go/user"
)
// NodeInfo groups the data about the storage node

2
pkg/innerring/processors/settlement/common/util.go
View file

@ -3,7 +3,7 @@ package common
import (
"math/big"
"github.com/nspcc-dev/neofs-sdk-go/user"
"github.com/TrueCloudLab/frostfs-sdk-go/user"
)
type TransferTable struct {

2
pkg/innerring/processors/settlement/deps.go
View file

@ -1,7 +1,7 @@
package settlement
import (
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/basic"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/basic"
)
// AuditProcessor is an interface of data audit fee processor.

2
pkg/innerring/processors/settlement/events.go
View file

@ -1,7 +1,7 @@
package settlement
import (
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/event"
)
// AuditEvent is an event of the start of

2
pkg/innerring/processors/settlement/handlers.go
View file

@ -1,6 +1,6 @@
package settlement
import "github.com/nspcc-dev/neofs-node/pkg/util/logger"
import "github.com/TrueCloudLab/frostfs-node/pkg/util/logger"
type auditEventHandler struct {
log *logger.Logger

2
pkg/innerring/processors/settlement/opts.go
View file

@ -1,7 +1,7 @@
package settlement
import (
"github.com/nspcc-dev/neofs-node/pkg/util/logger"
"github.com/TrueCloudLab/frostfs-node/pkg/util/logger"
"go.uber.org/zap"
)

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

@ -4,9 +4,9 @@ import (
"fmt"
"sync"
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/basic"
nodeutil "github.com/nspcc-dev/neofs-node/pkg/util"
"github.com/nspcc-dev/neofs-node/pkg/util/logger"
"github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/basic"
nodeutil "github.com/TrueCloudLab/frostfs-node/pkg/util"
"github.com/TrueCloudLab/frostfs-node/pkg/util/logger"
"github.com/panjf2000/ants/v2"
"go.uber.org/zap"
)

2
pkg/innerring/processors/subnet/common.go
View file

@ -3,7 +3,7 @@ package subnetevents
import (
"fmt"
subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id"
subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id"
)
// common interface of subnet notifications with subnet ID.

2
pkg/innerring/processors/subnet/common_test.go
View file

@ -1,6 +1,6 @@
package subnetevents
import subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id"
import subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id"
type idEvent struct {
id subnetid.ID

6
pkg/innerring/processors/subnet/put.go
View file

@ -4,9 +4,9 @@ import (
"errors"
"fmt"
"github.com/nspcc-dev/neofs-sdk-go/subnet"
subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id"
"github.com/nspcc-dev/neofs-sdk-go/user"
"github.com/TrueCloudLab/frostfs-sdk-go/subnet"
subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id"
"github.com/TrueCloudLab/frostfs-sdk-go/user"
)
// Put represents a notification about NeoFS subnet creation.

8
pkg/innerring/processors/subnet/put_test.go
View file

@ -4,12 +4,12 @@ import (
"errors"
"testing"
"github.com/nspcc-dev/neofs-sdk-go/user"
usertest "github.com/nspcc-dev/neofs-sdk-go/user/test"
"github.com/TrueCloudLab/frostfs-sdk-go/user"
usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test"
"github.com/stretchr/testify/require"
"github.com/nspcc-dev/neofs-sdk-go/subnet"
subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id"
"github.com/TrueCloudLab/frostfs-sdk-go/subnet"
subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id"
)
type put struct {