Skip to content

Commit 4e34161

Browse files
committed
*: rename sidechain to FS chain
Signed-off-by: Andrey Butusov <[email protected]>
1 parent 6f3ff4a commit 4e34161

File tree

37 files changed

+176
-177
lines changed

37 files changed

+176
-177
lines changed

cmd/neofs-adm/internal/modules/morph/initialize.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ type initializeContext struct {
4343
ContractPath string
4444
}
4545

46-
func initializeSideChainCmd(cmd *cobra.Command, _ []string) error {
46+
func initializeFSChainCmd(cmd *cobra.Command, _ []string) error {
4747
initCtx, err := newInitializeContext(cmd, viper.GetViper())
4848
if err != nil {
4949
return fmt.Errorf("initialization error: %w", err)

cmd/neofs-adm/internal/modules/morph/initialize_deploy.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import (
3333

3434
const (
3535
nnsContract = "nns"
36-
neofsContract = "neofs" // not deployed in side-chain.
37-
processingContract = "processing" // not deployed in side-chain.
36+
neofsContract = "neofs" // not deployed in FS chain.
37+
processingContract = "processing" // not deployed in FS chain.
3838
alphabetContract = "alphabet"
3939
auditContract = "audit"
4040
balanceContract = "balance"

cmd/neofs-adm/internal/modules/morph/initialize_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func testInitialize(t *testing.T, committeeSize int) {
5151
v.Set(maxObjectSizeInitFlag, 1024)
5252

5353
setTestCredentials(v, committeeSize)
54-
require.NoError(t, initializeSideChainCmd(initCmd, nil))
54+
require.NoError(t, initializeFSChainCmd(initCmd, nil))
5555

5656
t.Run("force-new-epoch", func(t *testing.T) {
5757
require.NoError(t, forceNewEpochCmd(forceNewEpoch, nil))

cmd/neofs-adm/internal/modules/morph/root.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ var (
7979

8080
initCmd = &cobra.Command{
8181
Use: "init",
82-
Short: "Initialize side chain network with smart-contracts and network settings",
82+
Short: "Initialize FS chain network with smart-contracts and network settings",
8383
PreRun: func(cmd *cobra.Command, _ []string) {
8484
_ = viper.BindPFlag(alphabetWalletsFlag, cmd.Flags().Lookup(alphabetWalletsFlag))
8585
_ = viper.BindPFlag(endpointFlag, cmd.Flags().Lookup(endpointFlag))
@@ -95,7 +95,7 @@ var (
9595
_ = viper.BindPFlag(protoConfigPath, cmd.Flags().Lookup(protoConfigPath))
9696
_ = viper.BindPFlag(localDumpFlag, cmd.Flags().Lookup(localDumpFlag))
9797
},
98-
RunE: initializeSideChainCmd,
98+
RunE: initializeFSChainCmd,
9999
}
100100

101101
generateStorageCmd = &cobra.Command{
@@ -182,7 +182,7 @@ var (
182182

183183
forceNewEpoch = &cobra.Command{
184184
Use: "force-new-epoch",
185-
Short: "Create new NeoFS epoch event in the side chain",
185+
Short: "Create new NeoFS epoch event in FS chain",
186186
PreRun: func(cmd *cobra.Command, _ []string) {
187187
_ = viper.BindPFlag(alphabetWalletsFlag, cmd.Flags().Lookup(alphabetWalletsFlag))
188188
_ = viper.BindPFlag(endpointFlag, cmd.Flags().Lookup(endpointFlag))
@@ -375,7 +375,7 @@ func init() {
375375
initCmd.Flags().String(alphabetWalletsFlag, "", "Path to alphabet wallets dir")
376376
initCmd.Flags().StringP(endpointFlag, "r", "", "N3 RPC node endpoint")
377377
initCmd.Flags().String(contractsInitFlag, "", "Path to archive with compiled NeoFS contracts (default fetched from latest github release)")
378-
initCmd.Flags().Uint(epochDurationCLIFlag, 240, "Amount of side chain blocks in one NeoFS epoch")
378+
initCmd.Flags().Uint(epochDurationCLIFlag, 240, "Amount of FS chain blocks in one NeoFS epoch")
379379
initCmd.Flags().Uint(maxObjectSizeCLIFlag, 67108864, "Max single object size in bytes")
380380
initCmd.Flags().Bool(homomorphicHashDisabledCLIFlag, false, "Disable object homomorphic hashing")
381381
// Defaults are taken from neo-preodolenie.
@@ -497,7 +497,7 @@ func init() {
497497

498498
cmd := verifiedNodesDomainAccessListCmd
499499
fs := cmd.Flags()
500-
fs.StringP(endpointFlag, "r", "", "NeoFS Sidechain RPC endpoint")
500+
fs.StringP(endpointFlag, "r", "", "FS chain RPC endpoint")
501501
_ = cmd.MarkFlagRequired(endpointFlag)
502502
fs.StringP(domainFlag, "d", "", "Verified domain of the storage nodes. Must be a valid NeoFS NNS domain (e.g. 'nodes.some-org.neofs')")
503503
_ = cmd.MarkFlagRequired(domainFlag)
@@ -510,7 +510,7 @@ func init() {
510510
_ = cmd.MarkFlagRequired(walletFlag)
511511
fs.StringP(walletAccountFlag, "a", "", "Optional Neo address of the wallet account for signing transactions. "+
512512
"If omitted, default change address from the wallet is used")
513-
fs.StringP(endpointFlag, "r", "", "NeoFS Sidechain RPC endpoint")
513+
fs.StringP(endpointFlag, "r", "", "FS chain RPC endpoint")
514514
_ = cmd.MarkFlagRequired(endpointFlag)
515515
fs.StringP(domainFlag, "d", "", "Verified domain of the storage nodes. Must be a valid NeoFS NNS domain (e.g. 'nodes.some-org.neofs')")
516516
_ = cmd.MarkFlagRequired(domainFlag)

cmd/neofs-adm/internal/modules/storagecfg/config.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ control:
3333
endpoint: {{.ControlEndpoint}} # endpoint that is listened by the Control Service
3434
3535
morph:
36-
dial_timeout: 20s # timeout for side chain NEO RPC client connection
37-
cache_ttl: 15s # use TTL cache for side chain GET operations
38-
endpoints: # side chain N3 RPC endpoints
36+
dial_timeout: 20s # timeout for FS chain NEO RPC client connection
37+
cache_ttl: 15s # use TTL cache for FS chain GET operations
38+
endpoints: # FS chain N3 RPC endpoints
3939
{{- range .MorphRPC }}
4040
- wss://{{.}}/ws{{end}}
4141
{{if not .Relay }}

cmd/neofs-adm/internal/modules/storagecfg/root.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -378,23 +378,23 @@ func applyTemplate(c config) ([]byte, error) {
378378
}
379379

380380
func depositGas(cmd *cobra.Command, acc *wallet.Account, network string) error {
381-
sideClient, err := initClient(n3config[network].MorphRPC)
381+
fsClient, err := initClient(n3config[network].MorphRPC)
382382
if err != nil {
383383
return err
384384
}
385385
balanceHash, _ := util.Uint160DecodeStringLE(n3config[network].BalanceContract)
386386

387-
sideActor, err := actor.NewSimple(sideClient, acc)
387+
fsActor, err := actor.NewSimple(fsClient, acc)
388388
if err != nil {
389-
return fmt.Errorf("creating actor over side chain client: %w", err)
389+
return fmt.Errorf("creating actor over FS chain client: %w", err)
390390
}
391391

392-
sideGas := nep17.NewReader(sideActor, balanceHash)
392+
fsGas := nep17.NewReader(fsActor, balanceHash)
393393
accSH := acc.Contract.ScriptHash()
394394

395-
balance, err := sideGas.BalanceOf(accSH)
395+
balance, err := fsGas.BalanceOf(accSH)
396396
if err != nil {
397-
return fmt.Errorf("side chain balance: %w", err)
397+
return fmt.Errorf("FS chain balance: %w", err)
398398
}
399399

400400
ok, err := getConfirmation(false, fmt.Sprintf("Current NeoFS balance is %s, make a deposit? y/[n]: ",

cmd/neofs-cli/modules/container/create.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var createContainerCmd = &cobra.Command{
3434
Use: "create",
3535
Short: "Create new container",
3636
Long: `Create new container and register it in the NeoFS.
37-
It will be stored in sidechain when inner ring will accepts it.`,
37+
It will be stored in FS chain when inner ring will accepts it.`,
3838
Args: cobra.NoArgs,
3939
RunE: func(cmd *cobra.Command, _ []string) error {
4040
if containerName == "" && containerGlobalName {
@@ -163,7 +163,7 @@ It will be stored in sidechain when inner ring will accepts it.`,
163163

164164
_, err := internalclient.GetContainer(ctx, getPrm)
165165
if err == nil {
166-
cmd.Println("container has been persisted on sidechain")
166+
cmd.Println("container has been persisted on FS chain")
167167
return nil
168168
}
169169
}

cmd/neofs-cli/modules/container/set_eacl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Container ID in EACL table will be substituted with ID from the CLI.`,
147147
got := table.Marshal()
148148

149149
if bytes.Equal(exp, got) {
150-
cmd.Println("EACL has been persisted on sidechain")
150+
cmd.Println("EACL has been persisted on FS chain")
151151
return nil
152152
}
153153
}

cmd/neofs-ir/internal/validate/validate_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ morph:
2424
reconnections_number: 5
2525
reconnections_delay: 5s
2626
endpoints:
27-
- wss://sidechain1.fs.neo.org:30333/ws
28-
- wss://sidechain2.fs.neo.org:30333/ws
27+
- wss://fschain1.fs.neo.org:30333/ws
28+
- wss://fschain2.fs.neo.org:30333/ws
2929
validators:
3030
- 0283120f4c8c1fc1d792af5063d2def9da5fddc90bc1384de7fcfdda33c3860170
3131
consensus:

cmd/neofs-node/cache.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func (s *ttlContainerStorage) handleRemoval(cnr cid.ID) {
199199
}
200200

201201
// Get returns container value from the cache. If value is missing in the cache
202-
// or expired, then it returns value from side chain and updates the cache.
202+
// or expired, then it returns value from FS chain and updates the cache.
203203
func (s *ttlContainerStorage) Get(cnr cid.ID) (*container.Container, error) {
204204
val, err := s.tc.get(cnr)
205205
if err != nil {
@@ -228,7 +228,7 @@ func newCachedEACLStorage(v container.EACLSource, ttl time.Duration) *ttlEACLSto
228228
}
229229

230230
// GetEACL returns eACL value from the cache. If value is missing in the cache
231-
// or expired, then it returns value from side chain and updates cache.
231+
// or expired, then it returns value from FS chain and updates cache.
232232
func (s *ttlEACLStorage) GetEACL(cnr cid.ID) (*container.EACL, error) {
233233
val, err := s.tc.get(cnr)
234234
if err != nil {
@@ -333,7 +333,7 @@ func newCachedContainerLister(c *cntClient.Client, ttl time.Duration) *ttlContai
333333
}
334334

335335
// List returns list of container IDs from the cache. If list is missing in the
336-
// cache or expired, then it returns container IDs from side chain and updates
336+
// cache or expired, then it returns container IDs from FS chain and updates
337337
// the cache.
338338
func (s *ttlContainerLister) List(id *user.ID) ([]cid.ID, error) {
339339
if id == nil {
@@ -365,7 +365,7 @@ func (s *ttlContainerLister) update(owner user.ID, cnr cid.ID, add bool) {
365365
vt, ok := s.inner.cache.Peek(strOwner)
366366
if !ok {
367367
// we could cache the single cnr but in this case we will disperse
368-
// with the Sidechain a lot
368+
// with FS chain a lot
369369
return
370370
}
371371

@@ -385,7 +385,7 @@ func (s *ttlContainerLister) update(owner user.ID, cnr cid.ID, add bool) {
385385
item.list = append(item.list[:i], item.list[i+1:]...)
386386
// if list became empty we don't remove the value from the cache
387387
// since empty list is a correct value, and we don't want to insta
388-
// re-request it from the Sidechain
388+
// re-request it from FS chain
389389
}
390390

391391
break
@@ -415,7 +415,7 @@ func newCachedIRFetcher(f interface{ InnerRingKeys() ([][]byte, error) }) *cache
415415
// requests (neofs-node #1278), so limiting the request rate solves the issue.
416416
//
417417
// Exact request rate doesn't really matter because Inner Ring list update
418-
// happens extremely rare, but there is no side chain events for that as
418+
// happens extremely rare, but there is no FS chain events for that as
419419
// for now (neofs-contract v0.15.0 notary disabled env) to monitor it.
420420
irFetcherCacheTTL = 30 * time.Second
421421
)
@@ -430,7 +430,7 @@ func newCachedIRFetcher(f interface{ InnerRingKeys() ([][]byte, error) }) *cache
430430
}
431431

432432
// InnerRingKeys returns cached list of Inner Ring keys. If keys are missing in
433-
// the cache or expired, then it returns keys from side chain and updates
433+
// the cache or expired, then it returns keys from FS chain and updates
434434
// the cache.
435435
func (f *cachedIRFetcher) InnerRingKeys() ([][]byte, error) {
436436
val, err := f.tc.get(struct{}{})

0 commit comments

Comments
 (0)