[#248] config: Remove audit-related parameters
All checks were successful
ci/woodpecker/pr/pre-commit Pipeline was successful
ci/woodpecker/push/pre-commit Pipeline was successful

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2023-04-25 10:42:44 +03:00
parent f368ccbdf0
commit 3bac5a485d
4 changed files with 0 additions and 57 deletions

View file

@ -33,10 +33,6 @@ func defaultConfiguration(cfg *viper.Viper) {
setEmitDefaults(cfg) setEmitDefaults(cfg)
setAuditDefaults(cfg)
setSettlementDefaults(cfg)
cfg.SetDefault("indexer.cache_timeout", 15*time.Second) cfg.SetDefault("indexer.cache_timeout", 15*time.Second)
cfg.SetDefault("locode.db.path", "") cfg.SetDefault("locode.db.path", "")
@ -60,23 +56,6 @@ func setFeeDefaults(cfg *viper.Viper) {
cfg.SetDefault("fee.named_container_register", 25_0000_0000) // 25.0 Fixed8 cfg.SetDefault("fee.named_container_register", 25_0000_0000) // 25.0 Fixed8
} }
func setSettlementDefaults(cfg *viper.Viper) {
cfg.SetDefault("settlement.basic_income_rate", 0)
cfg.SetDefault("settlement.audit_fee", 0)
}
func setAuditDefaults(cfg *viper.Viper) {
cfg.SetDefault("audit.task.exec_pool_size", 10)
cfg.SetDefault("audit.task.queue_capacity", 100)
cfg.SetDefault("audit.timeout.get", "5s")
cfg.SetDefault("audit.timeout.head", "5s")
cfg.SetDefault("audit.timeout.rangehash", "5s")
cfg.SetDefault("audit.timeout.search", "10s")
cfg.SetDefault("audit.pdp.max_sleep_interval", "5s")
cfg.SetDefault("audit.pdp.pairs_pool_size", "10")
cfg.SetDefault("audit.por.pool_size", "10")
}
func setEmitDefaults(cfg *viper.Viper) { func setEmitDefaults(cfg *viper.Viper) {
cfg.SetDefault("emit.storage.amount", 0) cfg.SetDefault("emit.storage.amount", 0)
cfg.SetDefault("emit.mint.cache_size", 1000) cfg.SetDefault("emit.mint.cache_size", 1000)
@ -124,7 +103,6 @@ func setContractsDefaults(cfg *viper.Viper) {
cfg.SetDefault("contracts.frostfs", "") cfg.SetDefault("contracts.frostfs", "")
cfg.SetDefault("contracts.balance", "") cfg.SetDefault("contracts.balance", "")
cfg.SetDefault("contracts.container", "") cfg.SetDefault("contracts.container", "")
cfg.SetDefault("contracts.audit", "")
cfg.SetDefault("contracts.proxy", "") cfg.SetDefault("contracts.proxy", "")
cfg.SetDefault("contracts.processing", "") cfg.SetDefault("contracts.processing", "")
cfg.SetDefault("contracts.proxy", "") cfg.SetDefault("contracts.proxy", "")

View file

@ -50,16 +50,6 @@ 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_AUDIT_TIMEOUT_GET=5s
FROSTFS_IR_AUDIT_TIMEOUT_HEAD=5s
FROSTFS_IR_AUDIT_TIMEOUT_RANGEHASH=5s
FROSTFS_IR_AUDIT_TIMEOUT_SEARCH=10s
FROSTFS_IR_AUDIT_TASK_EXEC_POOL_SIZE=10
FROSTFS_IR_AUDIT_TASK_QUEUE_CAPACITY=100
FROSTFS_IR_AUDIT_PDP_PAIRS_POOL_SIZE=10
FROSTFS_IR_AUDIT_PDP_MAX_SLEEP_INTERVAL=5s
FROSTFS_IR_AUDIT_POR_POOL_SIZE=10
FROSTFS_IR_INDEXER_CACHE_TIMEOUT=15s FROSTFS_IR_INDEXER_CACHE_TIMEOUT=15s
FROSTFS_IR_NETMAP_CLEANER_ENABLED=true FROSTFS_IR_NETMAP_CLEANER_ENABLED=true
@ -67,7 +57,6 @@ FROSTFS_IR_NETMAP_CLEANER_THRESHOLD=3
FROSTFS_IR_CONTRACTS_NEOFS=ee3dee6d05dc79c24a5b8f6985e10d68b7cacc62 FROSTFS_IR_CONTRACTS_NEOFS=ee3dee6d05dc79c24a5b8f6985e10d68b7cacc62
FROSTFS_IR_CONTRACTS_PROCESSING=597f5894867113a41e192801709c02497f611de8 FROSTFS_IR_CONTRACTS_PROCESSING=597f5894867113a41e192801709c02497f611de8
FROSTFS_IR_CONTRACTS_AUDIT=219e37aed2180b87e7fe945dbf97d67125e8d73f
FROSTFS_IR_CONTRACTS_BALANCE=d2aa48d14b17b11bc4c68205027884a96706dd16 FROSTFS_IR_CONTRACTS_BALANCE=d2aa48d14b17b11bc4c68205027884a96706dd16
FROSTFS_IR_CONTRACTS_CONTAINER=ed4a7a66fe3f9bfe50f214b49be8f215a3c886b6 FROSTFS_IR_CONTRACTS_CONTAINER=ed4a7a66fe3f9bfe50f214b49be8f215a3c886b6
FROSTFS_IR_CONTRACTS_NEOFSID=9f5866decbc751a099e74c7c7bc89f609201755a FROSTFS_IR_CONTRACTS_NEOFSID=9f5866decbc751a099e74c7c7bc89f609201755a
@ -89,6 +78,3 @@ FROSTFS_IR_PPROF_SHUTDOWN_TIMEOUT=30s
FROSTFS_IR_PROMETHEUS_ENABLED=true FROSTFS_IR_PROMETHEUS_ENABLED=true
FROSTFS_IR_PROMETHEUS_ADDRESS=localhost:9090 FROSTFS_IR_PROMETHEUS_ADDRESS=localhost:9090
FROSTFS_IR_PROMETHEUS_SHUTDOWN_TIMEOUT=30s FROSTFS_IR_PROMETHEUS_SHUTDOWN_TIMEOUT=30s
FROSTFS_IR_SETTLEMENT_BASIC_INCOME_RATE=100
FROSTFS_IR_SETTLEMENT_AUDIT_FEE=100

View file

@ -84,21 +84,6 @@ workers:
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
audit:
timeout:
get: 5s # Timeout for object.Get operation during data audit
head: 5s # Timeout for object.Head operation during data audit
rangehash: 5s # Timeout for object.RangeHash operation during data audit
search: 10s # Timeout for object.Search operation during data audit
task:
exec_pool_size: 10 # Number of workers to process audit routine in parallel
queue_capacity: 100 # Maximum amount of simultaneous audit jobs
pdp:
pairs_pool_size: 10 # Number of workers to process PDP part of data audit in parallel
max_sleep_interval: 5s # Maximum timeout between object.RangeHash requests to the storage node
por:
pool_size: 10 # Number of workers to process PoR part of data audit in parallel
indexer: indexer:
cache_timeout: 15s # Duration between internal state update about current list of inner ring nodes cache_timeout: 15s # Duration between internal state update about current list of inner ring nodes
@ -109,7 +94,6 @@ netmap_cleaner:
contracts: contracts:
frostfs: ee3dee6d05dc79c24a5b8f6985e10d68b7cacc62 # Address of FrostFS contract in mainchain; ignore if mainchain is disabled frostfs: ee3dee6d05dc79c24a5b8f6985e10d68b7cacc62 # Address of FrostFS contract in mainchain; ignore if mainchain is disabled
processing: 597f5894867113a41e192801709c02497f611de8 # Address of processing contract in mainchain; ignore if mainchain is disabled or notary is disabled in mainchain processing: 597f5894867113a41e192801709c02497f611de8 # Address of processing contract in mainchain; ignore if mainchain is disabled or notary is disabled in mainchain
audit: 219e37aed2180b87e7fe945dbf97d67125e8d73f # Optional: override address of audit contract in sidechain
balance: d2aa48d14b17b11bc4c68205027884a96706dd16 # Optional: override address of balance contract in sidechain balance: d2aa48d14b17b11bc4c68205027884a96706dd16 # Optional: override address of balance contract in sidechain
container: ed4a7a66fe3f9bfe50f214b49be8f215a3c886b6 # Optional: override address of container contract in sidechain container: ed4a7a66fe3f9bfe50f214b49be8f215a3c886b6 # Optional: override address of container contract in sidechain
frostfsid: 9f5866decbc751a099e74c7c7bc89f609201755a # Optional: override address of frostfsid contract in sidechain frostfsid: 9f5866decbc751a099e74c7c7bc89f609201755a # Optional: override address of frostfsid contract in sidechain
@ -134,7 +118,3 @@ prometheus:
enabled: true enabled: true
address: localhost:9090 # Endpoint for application prometheus metrics; disabled by default address: localhost:9090 # Endpoint for application prometheus metrics; disabled by default
shutdown_timeout: 30s # Timeout for metrics HTTP server graceful shutdown shutdown_timeout: 30s # Timeout for metrics HTTP server graceful shutdown
settlement:
basic_income_rate: 100 # Optional: override basic income rate value from network config; applied only in debug mode
audit_fee: 100 # Optional: override audit fee value from network config; applied only in debug mode

View file

@ -118,7 +118,6 @@ contracts:
| Parameter | Type | Default value | Description | | Parameter | Type | Default value | Description |
|--------------|-----------|---------------|---------------------------| |--------------|-----------|---------------|---------------------------|
| `audit` | `hash160` | | Audit contract hash. |
| `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. |