From 090f73fd444454b0339185f4a6b51a559402ab1e Mon Sep 17 00:00:00 2001 From: Tanut Lertwarachai Date: Fri, 31 Jan 2025 14:56:45 +0700 Subject: [PATCH] change var name --- internal/relayertest/constants.go | 2 +- .../relayertest/testdata/custom_config.toml | 2 +- .../testdata/custom_config_with_time_str.toml | 2 +- .../relayertest/testdata/default_config.toml | 2 +- .../testdata/default_with_chain_config.toml | 2 +- relayer/app.go | 2 +- relayer/config.go | 4 +-- relayer/scheduler.go | 34 +++++++++---------- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/internal/relayertest/constants.go b/internal/relayertest/constants.go index 6a332b9..b13a059 100644 --- a/internal/relayertest/constants.go +++ b/internal/relayertest/constants.go @@ -23,7 +23,7 @@ var CustomCfg = falcon.Config{ Global: falcon.GlobalConfig{ CheckingPacketInterval: 1 * time.Minute, SyncTunnelsInterval: 5 * time.Minute, - PenaltyAttempts: 3, + PenaltySkipRounds: 3, LogLevel: "info", }, BandChain: band.Config{ diff --git a/internal/relayertest/testdata/custom_config.toml b/internal/relayertest/testdata/custom_config.toml index 3ef8fab..f1a5ce3 100644 --- a/internal/relayertest/testdata/custom_config.toml +++ b/internal/relayertest/testdata/custom_config.toml @@ -2,7 +2,7 @@ log_level = 'info' checking_packet_interval = 60000000000 sync_tunnels_interval = 300000000000 -penalty_attempts = 3 +penalty_skip_rounds = 3 [bandchain] rpc_endpoints = ['http://localhost:26657', 'http://localhost:26658'] diff --git a/internal/relayertest/testdata/custom_config_with_time_str.toml b/internal/relayertest/testdata/custom_config_with_time_str.toml index 25e2d7c..e1b465b 100644 --- a/internal/relayertest/testdata/custom_config_with_time_str.toml +++ b/internal/relayertest/testdata/custom_config_with_time_str.toml @@ -2,7 +2,7 @@ log_level = 'info' checking_packet_interval = '1m' sync_tunnels_interval = '5m' -penalty_attempts = 3 +penalty_skip_rounds = 3 [bandchain] rpc_endpoints = ['http://localhost:26657', 'http://localhost:26658'] diff --git a/internal/relayertest/testdata/default_config.toml b/internal/relayertest/testdata/default_config.toml index 0174aa0..8202fd8 100644 --- a/internal/relayertest/testdata/default_config.toml +++ b/internal/relayertest/testdata/default_config.toml @@ -2,7 +2,7 @@ log_level = 'info' checking_packet_interval = 60000000000 sync_tunnels_interval = 300000000000 -penalty_attempts = 3 +penalty_skip_rounds = 3 [bandchain] rpc_endpoints = ['http://localhost:26657'] diff --git a/internal/relayertest/testdata/default_with_chain_config.toml b/internal/relayertest/testdata/default_with_chain_config.toml index d05055f..54a8b48 100644 --- a/internal/relayertest/testdata/default_with_chain_config.toml +++ b/internal/relayertest/testdata/default_with_chain_config.toml @@ -2,7 +2,7 @@ log_level = 'info' checking_packet_interval = 60000000000 sync_tunnels_interval = 300000000000 -penalty_attempts = 3 +penalty_skip_rounds = 3 [bandchain] rpc_endpoints = ['http://localhost:26657'] diff --git a/relayer/app.go b/relayer/app.go index 56791c0..c981843 100644 --- a/relayer/app.go +++ b/relayer/app.go @@ -580,7 +580,7 @@ func (a *App) Start(ctx context.Context, tunnelIDs []uint64) error { tunnelRelayers, a.Config.Global.CheckingPacketInterval, a.Config.Global.SyncTunnelsInterval, - a.Config.Global.PenaltyAttempts, + a.Config.Global.PenaltySkipRounds, isSyncTunnelsAllowed, a.BandClient, a.TargetChains, diff --git a/relayer/config.go b/relayer/config.go index 569762c..c29acda 100644 --- a/relayer/config.go +++ b/relayer/config.go @@ -19,7 +19,7 @@ type GlobalConfig struct { LogLevel string `mapstructure:"log_level" toml:"log_level"` CheckingPacketInterval time.Duration `mapstructure:"checking_packet_interval" toml:"checking_packet_interval"` SyncTunnelsInterval time.Duration `mapstructure:"sync_tunnels_interval" toml:"sync_tunnels_interval"` - PenaltyAttempts uint `mapstructure:"penalty_attempts" toml:"penalty_attempts"` + PenaltySkipRounds uint `mapstructure:"penalty_skip_rounds" toml:"penalty_skip_rounds"` } // Config defines the configuration for the falcon tunnel relayer. @@ -135,7 +135,7 @@ func DefaultConfig() *Config { Global: GlobalConfig{ LogLevel: "info", CheckingPacketInterval: time.Minute, - PenaltyAttempts: 3, + PenaltySkipRounds: 3, SyncTunnelsInterval: 5 * time.Minute, }, } diff --git a/relayer/scheduler.go b/relayer/scheduler.go index 2bc77ca..76a5475 100644 --- a/relayer/scheduler.go +++ b/relayer/scheduler.go @@ -16,10 +16,10 @@ type Scheduler struct { TunnelRelayers []*TunnelRelayer CheckingPacketInterval time.Duration SyncTunnelsInterval time.Duration - PenaltyAttempts uint + PenaltySkipRounds uint - PenaltyAttemptssRemaining []uint - isSyncTunnelsAllowed bool + PenaltySkipRemaining []uint + isSyncTunnelsAllowed bool BandClient band.Client ChainProviders chains.ChainProviders @@ -37,15 +37,15 @@ func NewScheduler( chainProviders chains.ChainProviders, ) *Scheduler { return &Scheduler{ - Log: log, - TunnelRelayers: tunnelRelayers, - CheckingPacketInterval: checkingPacketInterval, - SyncTunnelsInterval: syncTunnelsInterval, - PenaltyAttempts: penaltyAttempts, - PenaltyAttemptssRemaining: make([]uint, len(tunnelRelayers)), - isSyncTunnelsAllowed: isSyncTunnelsAllowed, - BandClient: bandClient, - ChainProviders: chainProviders, + Log: log, + TunnelRelayers: tunnelRelayers, + CheckingPacketInterval: checkingPacketInterval, + SyncTunnelsInterval: syncTunnelsInterval, + PenaltySkipRounds: penaltyAttempts, + PenaltySkipRemaining: make([]uint, len(tunnelRelayers)), + isSyncTunnelsAllowed: isSyncTunnelsAllowed, + BandClient: bandClient, + ChainProviders: chainProviders, } } @@ -78,14 +78,14 @@ func (s *Scheduler) Start(ctx context.Context) error { func (s *Scheduler) Execute(ctx context.Context) { // Execute the task for each tunnel relayer for i, tr := range s.TunnelRelayers { - if s.PenaltyAttemptssRemaining[i] > 0 { + if s.PenaltySkipRemaining[i] > 0 { s.Log.Debug( "Skipping tunnel execution due to penalty from previous failure.", zap.Uint64("tunnel_id", tr.TunnelID), zap.Int("relayer_id", i), - zap.Uint("penalty_attempts_remaining", s.PenaltyAttemptssRemaining[i]), + zap.Uint("penalty_attempts_remaining", s.PenaltySkipRemaining[i]), ) - s.PenaltyAttemptssRemaining[i] -= 1 + s.PenaltySkipRemaining[i] -= 1 continue } @@ -113,7 +113,7 @@ func (s *Scheduler) TriggerTunnelRelayer(ctx context.Context, task Task) { // Check and relay the packet, if error occurs, set the error flag. if err := tr.CheckAndRelay(ctx); err != nil { - s.PenaltyAttemptssRemaining[task.RelayerID] = s.PenaltyAttempts + s.PenaltySkipRemaining[task.RelayerID] = s.PenaltySkipRounds s.Log.Error( "Failed to execute, Penalty for the tunnel relayer", @@ -170,7 +170,7 @@ func (s *Scheduler) SyncTunnels(ctx context.Context) { ) s.TunnelRelayers = append(s.TunnelRelayers, &tr) - s.PenaltyAttemptssRemaining = append(s.PenaltyAttemptssRemaining, 0) + s.PenaltySkipRemaining = append(s.PenaltySkipRemaining, 0) s.Log.Info( "New tunnel synchronized successfully", zap.String("chain_name", tunnels[i].TargetChainID),