From 27ef6dcd46f16cad2e610ed3cf622fcddc8f1985 Mon Sep 17 00:00:00 2001 From: Philip Offtermatt Date: Fri, 23 Aug 2024 14:39:06 +0200 Subject: [PATCH] Adjust info to debug; return err instead of panicking --- x/ccv/provider/keeper/partial_set_security.go | 4 ++-- x/ccv/types/utils.go | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/x/ccv/provider/keeper/partial_set_security.go b/x/ccv/provider/keeper/partial_set_security.go index 872222d222..3112124724 100644 --- a/x/ccv/provider/keeper/partial_set_security.go +++ b/x/ccv/provider/keeper/partial_set_security.go @@ -92,7 +92,7 @@ func (k Keeper) HandleOptOut(ctx sdk.Context, chainID string, providerAddr types func (k Keeper) OptInTopNValidators(ctx sdk.Context, chainID string, bondedValidators []stakingtypes.Validator, minPowerToOptIn int64) { for _, val := range bondedValidators { // log the validator - k.Logger(ctx).Info("Checking whether to opt in validator because of top N", "validator", val.GetOperator()) + k.Logger(ctx).Debug("Checking whether to opt in validator because of top N", "validator", val.GetOperator()) valAddr, err := sdk.ValAddressFromBech32(val.GetOperator()) if err != nil { @@ -114,7 +114,7 @@ func (k Keeper) OptInTopNValidators(ctx sdk.Context, chainID string, bondedValid continue } - k.Logger(ctx).Info("Opting in validator", "validator", val.GetOperator()) + k.Logger(ctx).Debug("Opting in validator", "validator", val.GetOperator()) // if validator already exists it gets overwritten k.SetOptedIn(ctx, chainID, types.NewProviderConsAddress(consAddr)) diff --git a/x/ccv/types/utils.go b/x/ccv/types/utils.go index 03e5f63be1..05e2387eb8 100644 --- a/x/ccv/types/utils.go +++ b/x/ccv/types/utils.go @@ -2,7 +2,6 @@ package types import ( "errors" - fmt "fmt" "reflect" "sort" "strings" @@ -132,7 +131,7 @@ func GetLastBondedValidatorsUtil(ctx sdk.Context, stakingKeeper StakingKeeper, l // get the bonded validators from the staking module, sorted by power bondedValidators, err := stakingKeeper.GetBondedValidatorsByPower(ctx) if err != nil { - panic(fmt.Errorf("failed to get bonded validators: %w", err)) + return nil, err } // get the first maxVals many validators