diff --git a/pkg/innerring/innerring.go b/pkg/innerring/innerring.go index 3f5520e03..443262aa8 100644 --- a/pkg/innerring/innerring.go +++ b/pkg/innerring/innerring.go @@ -777,7 +777,7 @@ func New(ctx context.Context, log *zap.Logger, cfg *viper.Viper) (*Server, error // initialize epoch timers server.epochTimer = newEpochTimer(&epochTimerArgs{ l: server.log, - nm: server.netmapProcessor, + newEpochHandlers: server.newEpochHandlers(log), cnrWrapper: cnrClient, epoch: server, epochDuration: globalConfig.EpochDuration, @@ -805,25 +805,6 @@ func New(ctx context.Context, log *zap.Logger, cfg *viper.Viper) (*Server, error server.addBlockTimer(emissionTimer) - // initialize notary timers - if !server.mainNotaryConfig.disabled { - mainNotaryTimer := newNotaryDepositTimer(¬aryDepositArgs{ - l: log, - depositor: server.depositMainNotary, - }) - - server.addBlockTimer(mainNotaryTimer) - } - - if !server.sideNotaryConfig.disabled { - sideNotaryTimer := newNotaryDepositTimer(¬aryDepositArgs{ - l: log, - depositor: server.depositSideNotary, - }) - - server.addBlockTimer(sideNotaryTimer) - } - controlSvcEndpoint := cfg.GetString("control.grpc.endpoint") if controlSvcEndpoint != "" { authKeysStr := cfg.GetStringSlice("control.authorized_keys") @@ -1039,3 +1020,31 @@ func (s *Server) onlyAlphabetEventHandler(f event.Handler) event.Handler { } } } + +func (s *Server) newEpochHandlers(log *zap.Logger) []newEpochHandler { + newEpochHandlers := []newEpochHandler{ + func() { + s.netmapProcessor.HandleNewEpochTick(timerEvent.NewEpochTick{}) + }, + } + + if !s.mainNotaryConfig.disabled { + newEpochHandlers = append(newEpochHandlers, + newNotaryDepositHandler(¬aryDepositArgs{ + l: log, + depositor: s.depositMainNotary, + }), + ) + } + + if !s.sideNotaryConfig.disabled { + newEpochHandlers = append(newEpochHandlers, + newNotaryDepositHandler(¬aryDepositArgs{ + l: log, + depositor: s.depositSideNotary, + }), + ) + } + + return newEpochHandlers +}