okonstantinova/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#247] config, doc: Drop reputation references

Browse source 
Signed-off-by: Pavel Karpy <p.karpy@yadro.com>
This commit is contained in:
Pavel Karpy 2023-04-14 13:41:40 +03:00
parent 560f73ab7e
commit 960e3c219e
14 changed files with 0 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/frostfs-adm/docs/deploy.md
View file

@ -147,7 +147,6 @@ NNS: Set container.frostfs -> cae60bdd689d185901e495352d0247752ce50846
NNS: Set frostfsid.frostfs -> c421fb60a3895865a8f24d197d6a80ef686041d2 NNS: Set frostfsid.frostfs -> c421fb60a3895865a8f24d197d6a80ef686041d2
NNS: Set netmap.frostfs -> 894eb854632f50fb124412ce7951ebc00763525e NNS: Set netmap.frostfs -> 894eb854632f50fb124412ce7951ebc00763525e
NNS: Set proxy.frostfs -> ac6e6fe4b373d0ca0ca4969d1e58fa0988724e7d NNS: Set proxy.frostfs -> ac6e6fe4b373d0ca0ca4969d1e58fa0988724e7d
NNS: Set reputation.frostfs -> 6eda57c9d93d990573646762d1fea327ce41191f
Waiting for transactions to persist... Waiting for transactions to persist...
``` ```

5
cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go
View file

@ -47,7 +47,6 @@ const (
frostfsIDContract = "frostfsid" frostfsIDContract = "frostfsid"
netmapContract = "netmap" netmapContract = "netmap"
proxyContract = "proxy" proxyContract = "proxy"
reputationContract = "reputation"
subnetContract = "subnet" subnetContract = "subnet"
) )
@ -64,7 +63,6 @@ var (
frostfsIDContract, frostfsIDContract,
netmapContract, netmapContract,
proxyContract, proxyContract,
reputationContract,
subnetContract, subnetContract,
} }
@ -81,8 +79,6 @@ var (
netmap.AuditFeeConfig, netmap.AuditFeeConfig,
netmap.ContainerFeeConfig, netmap.ContainerFeeConfig,
netmap.ContainerAliasFeeConfig, netmap.ContainerAliasFeeConfig,
netmap.EtIterationsConfig,
netmap.EtAlphaConfig,
netmap.BasicIncomeRateConfig, netmap.BasicIncomeRateConfig,
netmap.IrCandidateFeeConfig, netmap.IrCandidateFeeConfig,
netmap.WithdrawFeeConfig, netmap.WithdrawFeeConfig,
@ -602,7 +598,6 @@ func (c *initializeContext) getContractDeployData(ctrName string, keysParam []an
configParam) configParam)
case proxyContract: case proxyContract:
items = nil items = nil
case reputationContract:
case subnetContract: case subnetContract:
default: default:
panic(fmt.Sprintf("invalid contract name: %s", ctrName)) panic(fmt.Sprintf("invalid contract name: %s", ctrName))

1
cmd/frostfs-ir/defaults.go
View file

@ -163,7 +163,6 @@ func setContractsDefaults(cfg *viper.Viper) {
cfg.SetDefault("contracts.audit", "") cfg.SetDefault("contracts.audit", "")
cfg.SetDefault("contracts.proxy", "") cfg.SetDefault("contracts.proxy", "")
cfg.SetDefault("contracts.processing", "") cfg.SetDefault("contracts.processing", "")
cfg.SetDefault("contracts.reputation", "")
cfg.SetDefault("contracts.subnet", "") cfg.SetDefault("contracts.subnet", "")
cfg.SetDefault("contracts.proxy", "") cfg.SetDefault("contracts.proxy", "")
} }

9
cmd/frostfs-node/config/contracts/config.go
View file

@ -38,15 +38,6 @@ func Container(c *config.Config) util.Uint160 {
return contractAddress(c, "container") return contractAddress(c, "container")
} }
// Reputation returnsthe value of "reputation" config parameter
// from "contracts" section.
//
// Returns zero filled script hash if the value is not set.
// Throws panic if the value is not a 20-byte LE hex-encoded string.
func Reputation(c *config.Config) util.Uint160 {
return contractAddress(c, "reputation")
}
// Proxy returnsthe value of "proxy" config parameter // Proxy returnsthe value of "proxy" config parameter
// from "contracts" section. // from "contracts" section.
// //

6
cmd/frostfs-node/config/contracts/config_test.go
View file

@ -18,7 +18,6 @@ func TestContractsSection(t *testing.T) {
require.Equal(t, emptyHash, contractsconfig.Balance(empty)) require.Equal(t, emptyHash, contractsconfig.Balance(empty))
require.Equal(t, emptyHash, contractsconfig.Container(empty)) require.Equal(t, emptyHash, contractsconfig.Container(empty))
require.Equal(t, emptyHash, contractsconfig.Netmap(empty)) require.Equal(t, emptyHash, contractsconfig.Netmap(empty))
require.Equal(t, emptyHash, contractsconfig.Reputation(empty))
require.Equal(t, emptyHash, contractsconfig.Proxy(empty)) require.Equal(t, emptyHash, contractsconfig.Proxy(empty))
}) })
@ -33,9 +32,6 @@ func TestContractsSection(t *testing.T) {
expNetmap, err := util.Uint160DecodeStringLE("0cce9e948dca43a6b592efe59ddb4ecb89bdd9ca") expNetmap, err := util.Uint160DecodeStringLE("0cce9e948dca43a6b592efe59ddb4ecb89bdd9ca")
require.NoError(t, err) require.NoError(t, err)
expReputation, err := util.Uint160DecodeStringLE("441995f631c1da2b133462b71859494a5cd45e90")
require.NoError(t, err)
expProxy, err := util.Uint160DecodeStringLE("ad7c6b55b737b696e5c82c85445040964a03e97f") expProxy, err := util.Uint160DecodeStringLE("ad7c6b55b737b696e5c82c85445040964a03e97f")
require.NoError(t, err) require.NoError(t, err)
@ -43,13 +39,11 @@ func TestContractsSection(t *testing.T) {
balance := contractsconfig.Balance(c) balance := contractsconfig.Balance(c)
container := contractsconfig.Container(c) container := contractsconfig.Container(c)
netmap := contractsconfig.Netmap(c) netmap := contractsconfig.Netmap(c)
reputation := contractsconfig.Reputation(c)
proxy := contractsconfig.Proxy(c) proxy := contractsconfig.Proxy(c)
require.Equal(t, expBalance, balance) require.Equal(t, expBalance, balance)
require.Equal(t, expConatiner, container) require.Equal(t, expConatiner, container)
require.Equal(t, expNetmap, netmap) require.Equal(t, expNetmap, netmap)
require.Equal(t, expReputation, reputation)
require.Equal(t, expProxy, proxy) require.Equal(t, expProxy, proxy)
} }

2
config/example/ir.env
View file

@ -49,7 +49,6 @@ FROSTFS_IR_WORKERS_BALANCE=10
FROSTFS_IR_WORKERS_CONTAINER=10 FROSTFS_IR_WORKERS_CONTAINER=10
FROSTFS_IR_WORKERS_NEOFS=10 FROSTFS_IR_WORKERS_NEOFS=10
FROSTFS_IR_WORKERS_NETMAP=10 FROSTFS_IR_WORKERS_NETMAP=10
FROSTFS_IR_WORKERS_REPUTATION=10
FROSTFS_IR_WORKERS_SUBNET=10 FROSTFS_IR_WORKERS_SUBNET=10
FROSTFS_IR_AUDIT_TIMEOUT_GET=5s FROSTFS_IR_AUDIT_TIMEOUT_GET=5s
@ -75,7 +74,6 @@ FROSTFS_IR_CONTRACTS_CONTAINER=ed4a7a66fe3f9bfe50f214b49be8f215a3c886b6
FROSTFS_IR_CONTRACTS_NEOFSID=9f5866decbc751a099e74c7c7bc89f609201755a FROSTFS_IR_CONTRACTS_NEOFSID=9f5866decbc751a099e74c7c7bc89f609201755a
FROSTFS_IR_CONTRACTS_NETMAP=83c600c81d47a1b1b7cf58eb49ae7ee7240dc742 FROSTFS_IR_CONTRACTS_NETMAP=83c600c81d47a1b1b7cf58eb49ae7ee7240dc742
FROSTFS_IR_CONTRACTS_PROXY=abc8794bb40a21f2db5f21ae62741eb46c8cad1c FROSTFS_IR_CONTRACTS_PROXY=abc8794bb40a21f2db5f21ae62741eb46c8cad1c
FROSTFS_IR_CONTRACTS_REPUTATION=d793b842ff0c103fe89e385069e82a27602135ff
FROSTFS_IR_CONTRACTS_SUBNET=e9266864d3c562c6e17f2bb9cb1392aaa293d93a FROSTFS_IR_CONTRACTS_SUBNET=e9266864d3c562c6e17f2bb9cb1392aaa293d93a
FROSTFS_IR_CONTRACTS_ALPHABET_AMOUNT=7 FROSTFS_IR_CONTRACTS_ALPHABET_AMOUNT=7
FROSTFS_IR_CONTRACTS_ALPHABET_AZ=c1d211fceeb4b1dc76b8e4054d11fdf887e418ea FROSTFS_IR_CONTRACTS_ALPHABET_AZ=c1d211fceeb4b1dc76b8e4054d11fdf887e418ea

2
config/example/ir.yaml
View file

@ -83,7 +83,6 @@ workers:
container: 10 # Number of workers to process events from container contract in parallel container: 10 # Number of workers to process events from container contract in parallel
frostfs: 10 # Number of workers to process events from frostfs contracts in parallel frostfs: 10 # Number of workers to process events from frostfs contracts in parallel
netmap: 10 # Number of workers to process events from netmap contract in parallel netmap: 10 # Number of workers to process events from netmap contract in parallel
reputation: 10 # Number of workers to process events from reputation contract in parallel
subnet: 10 # Number of workers to process events from subnet contract in parallel subnet: 10 # Number of workers to process events from subnet contract in parallel
audit: audit:
@ -117,7 +116,6 @@ contracts:
frostfsid: 9f5866decbc751a099e74c7c7bc89f609201755a # Optional: override address of frostfsid contract in sidechain frostfsid: 9f5866decbc751a099e74c7c7bc89f609201755a # Optional: override address of frostfsid contract in sidechain
netmap: 83c600c81d47a1b1b7cf58eb49ae7ee7240dc742 # Optional: override address of netmap contract in sidechain netmap: 83c600c81d47a1b1b7cf58eb49ae7ee7240dc742 # Optional: override address of netmap contract in sidechain
proxy: abc8794bb40a21f2db5f21ae62741eb46c8cad1c # Optional: override address of proxy contract in sidechain; ignore if notary is disabled in sidechain proxy: abc8794bb40a21f2db5f21ae62741eb46c8cad1c # Optional: override address of proxy contract in sidechain; ignore if notary is disabled in sidechain
reputation: d793b842ff0c103fe89e385069e82a27602135ff # Optional: override address of reputation contract in sidechain
subnet: e9266864d3c562c6e17f2bb9cb1392aaa293d93a # Optional: override address of subnet contract in sidechain subnet: e9266864d3c562c6e17f2bb9cb1392aaa293d93a # Optional: override address of subnet contract in sidechain
alphabet: alphabet:
amount: 7 # Optional: override amount of alphabet contracts amount: 7 # Optional: override amount of alphabet contracts

1
config/example/node.env
View file

@ -58,7 +58,6 @@ FROSTFS_CONTROL_GRPC_ENDPOINT=localhost:8090
FROSTFS_CONTRACTS_BALANCE=5263abba1abedbf79bb57f3e40b50b4425d2d6cd FROSTFS_CONTRACTS_BALANCE=5263abba1abedbf79bb57f3e40b50b4425d2d6cd
FROSTFS_CONTRACTS_CONTAINER=5d084790d7aa36cea7b53fe897380dab11d2cd3c FROSTFS_CONTRACTS_CONTAINER=5d084790d7aa36cea7b53fe897380dab11d2cd3c
FROSTFS_CONTRACTS_NETMAP=0cce9e948dca43a6b592efe59ddb4ecb89bdd9ca FROSTFS_CONTRACTS_NETMAP=0cce9e948dca43a6b592efe59ddb4ecb89bdd9ca
FROSTFS_CONTRACTS_REPUTATION=441995f631c1da2b133462b71859494a5cd45e90
FROSTFS_CONTRACTS_PROXY=ad7c6b55b737b696e5c82c85445040964a03e97f FROSTFS_CONTRACTS_PROXY=ad7c6b55b737b696e5c82c85445040964a03e97f
# Morph chain section # Morph chain section

1
config/example/node.json
View file

@ -96,7 +96,6 @@
"balance": "5263abba1abedbf79bb57f3e40b50b4425d2d6cd", "balance": "5263abba1abedbf79bb57f3e40b50b4425d2d6cd",
"container": "5d084790d7aa36cea7b53fe897380dab11d2cd3c", "container": "5d084790d7aa36cea7b53fe897380dab11d2cd3c",
"netmap": "0cce9e948dca43a6b592efe59ddb4ecb89bdd9ca", "netmap": "0cce9e948dca43a6b592efe59ddb4ecb89bdd9ca",
"reputation": "441995f631c1da2b133462b71859494a5cd45e90",
"proxy": "ad7c6b55b737b696e5c82c85445040964a03e97f" "proxy": "ad7c6b55b737b696e5c82c85445040964a03e97f"
}, },
"morph": { "morph": {

1
config/example/node.yaml
View file

@ -78,7 +78,6 @@ contracts: # side chain NEOFS contract script hashes; optional, override values
balance: 5263abba1abedbf79bb57f3e40b50b4425d2d6cd balance: 5263abba1abedbf79bb57f3e40b50b4425d2d6cd
container: 5d084790d7aa36cea7b53fe897380dab11d2cd3c container: 5d084790d7aa36cea7b53fe897380dab11d2cd3c
netmap: 0cce9e948dca43a6b592efe59ddb4ecb89bdd9ca netmap: 0cce9e948dca43a6b592efe59ddb4ecb89bdd9ca
reputation: 441995f631c1da2b133462b71859494a5cd45e90
proxy: ad7c6b55b737b696e5c82c85445040964a03e97f proxy: ad7c6b55b737b696e5c82c85445040964a03e97f
morph: morph:

1
config/mainnet/config.yml
View file

@ -68,4 +68,3 @@ contracts:
balance: dc1ec98d9d0c5f9dfade16144defe08cffc5ca55 balance: dc1ec98d9d0c5f9dfade16144defe08cffc5ca55
container: 1b6e68d299b570e1cb7e86eadfdc06aa2e8e0cc5 container: 1b6e68d299b570e1cb7e86eadfdc06aa2e8e0cc5
netmap: 7c5bdb23e36cc7cce95bf42f3ab9e452c2501df1 netmap: 7c5bdb23e36cc7cce95bf42f3ab9e452c2501df1
reputation: 7ad824fd1eeb1565be2cee3889214b9aa605d2fc

1
config/testnet/config.yml
View file

@ -16,7 +16,6 @@ contracts:
balance: e0420c216003747626670d1424569c17c79015bf balance: e0420c216003747626670d1424569c17c79015bf
container: 9dbd2b5e67568ed285c3d6f96bac4edf5e1efba0 container: 9dbd2b5e67568ed285c3d6f96bac4edf5e1efba0
netmap: d4b331639799e2958d4bc5b711b469d79de94e01 netmap: d4b331639799e2958d4bc5b711b469d79de94e01
reputation: 376c23a2ae1fad088c82046abb59984e3c4519d9
node: node:
key: /node.key key: /node.key

2
docs/storage-node-configuration.md
View file

@ -113,7 +113,6 @@ contracts:
balance: 5263abba1abedbf79bb57f3e40b50b4425d2d6cd balance: 5263abba1abedbf79bb57f3e40b50b4425d2d6cd
container: 5d084790d7aa36cea7b53fe897380dab11d2cd3c container: 5d084790d7aa36cea7b53fe897380dab11d2cd3c
netmap: 0cce9e948dca43a6b592efe59ddb4ecb89bdd9ca netmap: 0cce9e948dca43a6b592efe59ddb4ecb89bdd9ca
reputation: 441995f631c1da2b133462b71859494a5cd45e90
proxy: ad7c6b55b737b696e5c82c85445040964a03e97f proxy: ad7c6b55b737b696e5c82c85445040964a03e97f
``` ```
@ -123,7 +122,6 @@ contracts:
| `balance` | `hash160` | | Balance contract hash. | | `balance` | `hash160` | | Balance contract hash. |
| `container` | `hash160` | | Container contract hash. | | `container` | `hash160` | | Container contract hash. |
| `netmap` | `hash160` | | Netmap contract hash. | | `netmap` | `hash160` | | Netmap contract hash. |
| `reputation` | `hash160` | | Reputation contract hash. |
| `subnet` | `hash160` | | Subnet contract hash. | | `subnet` | `hash160` | | Subnet contract hash. |
# `morph` section # `morph` section

2
pkg/innerring/contracts.go
View file

@ -18,7 +18,6 @@ type contracts struct {
audit util.Uint160 // in morph audit util.Uint160 // in morph
proxy util.Uint160 // in morph proxy util.Uint160 // in morph
processing util.Uint160 // in mainnet processing util.Uint160 // in mainnet
reputation util.Uint160 // in morph
subnet util.Uint160 // in morph subnet util.Uint160 // in morph
frostfsID util.Uint160 // in morph frostfsID util.Uint160 // in morph
@ -61,7 +60,6 @@ func parseContracts(cfg *viper.Viper, morph *client.Client, withoutMainNet, with
{"contracts.balance", client.NNSBalanceContractName, &result.balance}, {"contracts.balance", client.NNSBalanceContractName, &result.balance},
{"contracts.container", client.NNSContainerContractName, &result.container}, {"contracts.container", client.NNSContainerContractName, &result.container},
{"contracts.audit", client.NNSAuditContractName, &result.audit}, {"contracts.audit", client.NNSAuditContractName, &result.audit},
{"contracts.reputation", client.NNSReputationContractName, &result.reputation},
{"contracts.subnet", client.NNSSubnetworkContractName, &result.subnet}, {"contracts.subnet", client.NNSSubnetworkContractName, &result.subnet},
{"contracts.frostfsid", client.NNSFrostFSIDContractName, &result.frostfsID}, {"contracts.frostfsid", client.NNSFrostFSIDContractName, &result.frostfsID},
} }