aarifullin
/
frostfs-node
forked from TrueCloudLab/frostfs-node
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#11] Rename `neofsid` contract to `frostfsid` 

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
carpawell/fix/multiple-cache-update-requests-FROST
Evgenii Stratonikov 2023-01-10 16:01:54 +03:00 committed by fyrchik
parent 023396e6a4
commit 9cb4b4cc17
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go
View File

@ -42,7 +42,7 @@ const (
auditContract = "audit"
balanceContract = "balance"
containerContract = "container"
neofsIDContract = "neofsid"
frostfsIDContract = "frostfsid"
netmapContract = "netmap"
proxyContract = "proxy"
reputationContract = "reputation"
@ -72,7 +72,7 @@ var (
auditContract,
balanceContract,
containerContract,
neofsIDContract,
frostfsIDContract,
netmapContract,
proxyContract,
reputationContract,
@ -543,10 +543,10 @@ func (c *initializeContext) getContractDeployData(ctrName string, keysParam []in
items = append(items,
c.Contracts[netmapContract].Hash,
c.Contracts[balanceContract].Hash,
c.Contracts[neofsIDContract].Hash,
c.Contracts[frostfsIDContract].Hash,
nnsCs.Hash,
"container")
case neofsIDContract:
case frostfsIDContract:
items = append(items,
c.Contracts[netmapContract].Hash,
c.Contracts[containerContract].Hash)

4
pkg/innerring/innerring.go
View File

@ -30,7 +30,7 @@ import (
balanceClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance"
cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container"
frostfsClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfs"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid"
nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
repClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/reputation"
morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet"
@ -508,7 +508,7 @@ func New(ctx context.Context, log *logger.Logger, cfg *viper.Viper, errChan chan
return nil, err
}
frostfsIDClient, err := neofsid.NewFromMorph(server.morphClient, server.contracts.frostfsID, fee, neofsid.TryNotary(), neofsid.AsAlphabet())
frostfsIDClient, err := frostfsid.NewFromMorph(server.morphClient, server.contracts.frostfsID, fee, frostfsid.TryNotary(), frostfsid.AsAlphabet())
if err != nil {
return nil, err
}

4
pkg/innerring/processors/container/common.go
View File

@ -5,7 +5,7 @@ import (
"errors"
"fmt"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid"
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"
@ -113,7 +113,7 @@ func (cp *Processor) verifySignature(v signatureVerificationData) error {
return errors.New("invalid signature calculated by container owner's key")
}
} else {
var prm neofsid.AccountKeysPrm
var prm frostfsid.AccountKeysPrm
prm.SetID(v.ownerContainer)
ownerKeys, err := cp.idClient.AccountKeys(prm)

6
pkg/innerring/processors/container/processor.go
View File

@ -5,7 +5,7 @@ import (
"fmt"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid"
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"
@ -27,7 +27,7 @@ type (
pool *ants.Pool
alphabetState AlphabetState
cnrClient *container.Client // notary must be enabled
idClient *neofsid.Client
idClient *frostfsid.Client
subnetClient *morphsubnet.Client
netState NetworkState
notaryDisabled bool
@ -39,7 +39,7 @@ type (
PoolSize int
AlphabetState AlphabetState
ContainerClient *container.Client
NeoFSIDClient *neofsid.Client
NeoFSIDClient *frostfsid.Client
SubnetClient *morphsubnet.Client
NetworkState NetworkState
NotaryDisabled bool

4
pkg/innerring/processors/frostfs/process_bind.go
View File

@ -4,7 +4,7 @@ import (
"crypto/elliptic"
"fmt"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid"
frostfs "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/frostfs"
"github.com/TrueCloudLab/frostfs-sdk-go/user"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
@ -87,7 +87,7 @@ func (np *Processor) approveBindCommon(e *bindCommonContext) {
var id user.ID
id.SetScriptHash(u160)
prm := neofsid.CommonBindPrm{}
prm := frostfsid.CommonBindPrm{}
prm.SetOwnerID(id.WalletBytes())
prm.SetKeys(e.Keys())
prm.SetHash(e.bindCommon.TxHash())

6
pkg/innerring/processors/frostfs/processor.go
View File

@ -7,7 +7,7 @@ import (
"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"
"github.com/TrueCloudLab/frostfs-node/pkg/morph/client/frostfsid"
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/frostfs"
@ -52,7 +52,7 @@ type (
mintEmitValue fixedn.Fixed8
gasBalanceThreshold int64
frostfsIDClient *neofsid.Client
frostfsIDClient *frostfsid.Client
}
// Params of the processor constructor.
@ -60,7 +60,7 @@ type (
Log *logger.Logger
PoolSize int
NeoFSContract util.Uint160
NeoFSIDClient *neofsid.Client
NeoFSIDClient *frostfsid.Client
BalanceClient *balance.Client
NetmapClient *nmClient.Client
MorphClient *client.Client

2
pkg/morph/client/neofsid/addrm_keys.go → pkg/morph/client/frostfsid/addrm_keys.go
View File

@ -1,4 +1,4 @@
package neofsid
package frostfsid
import (
"fmt"

2
pkg/morph/client/neofsid/client.go → pkg/morph/client/frostfsid/client.go
View File

@ -1,4 +1,4 @@
package neofsid
package frostfsid
import (
"fmt"

2
pkg/morph/client/neofsid/keys.go → pkg/morph/client/frostfsid/keys.go
View File

@ -1,4 +1,4 @@
package neofsid
package frostfsid
import (
"crypto/elliptic"