fix: remove error return on staking hooks

zeta-chain · Sep 17, 2024 · 102b872 · 102b872
1 parent 676e7d7
commit 102b872
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/x/observer/keeper/hooks.go b/x/observer/keeper/hooks.go
@@ -15,31 +15,31 @@ type Hooks struct {
 func (h Hooks) AfterValidatorRemoved(ctx sdk.Context, _ sdk.ConsAddress, valAddr sdk.ValAddress) error {
 	err := h.k.CleanObservers(ctx, valAddr)
 	if err != nil {
-		return err
+		ctx.Logger().Error("Error cleaning observer set", "error", err)
 	}
 	return nil
 }
 
 func (h Hooks) AfterValidatorBeginUnbonding(ctx sdk.Context, _ sdk.ConsAddress, valAddr sdk.ValAddress) error {
 	err := h.k.CheckAndCleanObserver(ctx, valAddr)
 	if err != nil {
-		return err
+		ctx.Logger().Error("Error cleaning observer set", "error", err)
 	}
 	return nil
 }
 
 func (h Hooks) AfterDelegationModified(ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress) error {
 	err := h.k.CheckAndCleanObserverDelegator(ctx, valAddr, delAddr)
 	if err != nil {
-		return err
+		ctx.Logger().Error("Error cleaning observer set", "error", err)
 	}
 	return nil
 }
 
 func (h Hooks) BeforeValidatorSlashed(ctx sdk.Context, valAddr sdk.ValAddress, fraction sdk.Dec) error {
 	err := h.k.CleanSlashedValidator(ctx, valAddr, fraction)
 	if err != nil {
-		return err
+		ctx.Logger().Error("Error cleaning observer set", "error", err)
 	}
 	return nil
 }

diff --git a/x/observer/keeper/hooks_test.go b/x/observer/keeper/hooks_test.go
@@ -139,15 +139,21 @@ func TestKeeper_AfterDelegationModified(t *testing.T) {
 }
 
 func TestKeeper_BeforeValidatorSlashed(t *testing.T) {
-	t.Run("should error if validator not found", func(t *testing.T) {
+	t.Run("should not error if validator not found", func(t *testing.T) {
 		k, ctx, _, _ := keepertest.ObserverKeeper(t)
 
 		r := rand.New(rand.NewSource(9))
 		validator := sample.Validator(t, r)
+		os := sample.ObserverSet(10)
+		k.SetObserverSet(ctx, os)
 
 		hooks := k.Hooks()
 		err := hooks.BeforeValidatorSlashed(ctx, validator.GetOperator(), sdk.NewDec(1))
-		require.Error(t, err)
+		require.NoError(t, err)
+
+		storedOs, found := k.GetObserverSet(ctx)
+		require.True(t, found)
+		require.Equal(t, os, storedOs)
 	})
 
 	t.Run("should not error if observer set not found", func(t *testing.T) {

diff --git a/x/observer/keeper/voting.go b/x/observer/keeper/voting.go
@@ -5,6 +5,7 @@ import (
 
 	sdkerrors "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/pkg/errors"
 
 	"github.com/zeta-chain/zetacore/pkg/chains"
 	"github.com/zeta-chain/zetacore/x/observer/types"
@@ -134,12 +135,12 @@ func (k Keeper) CheckObserverSelfDelegation(ctx sdk.Context, accAddress string)
 	}
 	validator, found := k.stakingKeeper.GetValidator(ctx, valAddress)
 	if !found {
-		return types.ErrNotValidator
+		return errors.Wrapf(types.ErrNotValidator, "validator : %s", valAddress)
 	}
 
 	delegation, found := k.stakingKeeper.GetDelegation(ctx, selfdelAddr, valAddress)
 	if !found {
-		return types.ErrSelfDelegation
+		return errors.Wrapf(types.ErrSelfDelegation, "self delegation : %s , valAddres : %s", selfdelAddr, valAddress)
 	}
 
 	minDelegation, err := types.GetMinObserverDelegationDec()