TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 100 Pull requests 4 Projects Releases 1 Activity Actions

[#873] innerring: Delete duration from notary configs

Browse source 
Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2021-10-12 16:56:16 +03:00 committed by Alex Vanin
parent e5748bfc96
commit 4afccab015
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/innerring/innerring.go
View file

@ -810,7 +810,6 @@ func New(ctx context.Context, log *zap.Logger, cfg *viper.Viper) (*Server, error
mainNotaryTimer := newNotaryDepositTimer(&notaryDepositArgs{ mainNotaryTimer := newNotaryDepositTimer(&notaryDepositArgs{
l: log, l: log,
depositor: server.depositMainNotary, depositor: server.depositMainNotary,
notaryDuration: server.mainNotaryConfig.duration,
}) })
server.addBlockTimer(mainNotaryTimer) server.addBlockTimer(mainNotaryTimer)
@ -820,7 +819,6 @@ func New(ctx context.Context, log *zap.Logger, cfg *viper.Viper) (*Server, error
sideNotaryTimer := newNotaryDepositTimer(&notaryDepositArgs{ sideNotaryTimer := newNotaryDepositTimer(&notaryDepositArgs{
l: log, l: log,
depositor: server.depositSideNotary, depositor: server.depositSideNotary,
notaryDuration: server.sideNotaryConfig.duration,
}) })
server.addBlockTimer(sideNotaryTimer) server.addBlockTimer(sideNotaryTimer)

4
pkg/innerring/notary.go
View file

@ -11,7 +11,6 @@ import (
type ( type (
notaryConfig struct { notaryConfig struct {
duration uint32 // lifetime of notary deposit in blocks
disabled bool // true if notary disabled on chain disabled bool // true if notary disabled on chain
} }
) )
@ -105,9 +104,6 @@ func parseNotaryConfigs(cfg *viper.Viper, withSideNotary, withMainNotary bool) (
} }
main.disabled = !withMainNotary main.disabled = !withMainNotary
main.duration = cfg.GetUint32("timers.main_notary")
side.duration = cfg.GetUint32("timers.side_notary")
return return
} }