diff --git a/x/stakeibc/keeper/icacallbacks_claim.go b/x/stakeibc/keeper/icacallbacks_claim.go index 2c776e097d..fc9dc82b25 100644 --- a/x/stakeibc/keeper/icacallbacks_claim.go +++ b/x/stakeibc/keeper/icacallbacks_claim.go @@ -3,15 +3,15 @@ package keeper import ( "fmt" - "github.com/Stride-Labs/stride/v23/utils" - icacallbackstypes "github.com/Stride-Labs/stride/v23/x/icacallbacks/types" - recordstypes "github.com/Stride-Labs/stride/v23/x/records/types" - "github.com/Stride-Labs/stride/v23/x/stakeibc/types" - errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/gogoproto/proto" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + + "github.com/Stride-Labs/stride/v23/utils" + icacallbackstypes "github.com/Stride-Labs/stride/v23/x/icacallbacks/types" + recordstypes "github.com/Stride-Labs/stride/v23/x/records/types" + "github.com/Stride-Labs/stride/v23/x/stakeibc/types" ) // Marshal claim callback args @@ -28,8 +28,7 @@ func (k Keeper) MarshalClaimCallbackArgs(ctx sdk.Context, claimCallback types.Cl func (k Keeper) UnmarshalClaimCallbackArgs(ctx sdk.Context, claimCallback []byte) (*types.ClaimCallback, error) { unmarshalledDelegateCallback := types.ClaimCallback{} if err := proto.Unmarshal(claimCallback, &unmarshalledDelegateCallback); err != nil { - k.Logger(ctx).Error(fmt.Sprintf("UnmarshalClaimCallbackArgs %v", err.Error())) - return nil, err + return nil, errorsmod.Wrap(err, "unable to unmarshal claim callback args") } return &unmarshalledDelegateCallback, nil } @@ -41,7 +40,7 @@ func (k Keeper) ClaimCallback(ctx sdk.Context, packet channeltypes.Packet, ackRe // Fetch callback args claimCallback, err := k.UnmarshalClaimCallbackArgs(ctx, args) if err != nil { - return errorsmod.Wrapf(types.ErrUnmarshalFailure, fmt.Sprintf("Unable to unmarshal claim callback args: %s", err.Error())) + return err } chainId := claimCallback.ChainId k.Logger(ctx).Info(utils.LogICACallbackWithHostZone(chainId, ICACallbackID_Claim, diff --git a/x/stakeibc/keeper/icacallbacks_claim_test.go b/x/stakeibc/keeper/icacallbacks_claim_test.go index fc19db4db0..c8c5ebaff6 100644 --- a/x/stakeibc/keeper/icacallbacks_claim_test.go +++ b/x/stakeibc/keeper/icacallbacks_claim_test.go @@ -188,7 +188,7 @@ func (s *KeeperTestSuite) TestClaimCallback_WrongCallbackArgs() { invalidCallbackArgs := []byte("random bytes") err := s.App.StakeibcKeeper.ClaimCallback(s.Ctx, tc.validArgs.packet, tc.validArgs.ackResponse, invalidCallbackArgs) - s.Require().EqualError(err, "Unable to unmarshal claim callback args: unexpected EOF: unable to unmarshal data structure") + s.Require().ErrorContains(err, "unable to unmarshal claim callback args") } func (s *KeeperTestSuite) TestClaimCallback_RecordNotFound() { diff --git a/x/stakeibc/keeper/icacallbacks_rebalance.go b/x/stakeibc/keeper/icacallbacks_rebalance.go index cadb578952..1751676373 100644 --- a/x/stakeibc/keeper/icacallbacks_rebalance.go +++ b/x/stakeibc/keeper/icacallbacks_rebalance.go @@ -28,8 +28,7 @@ func (k Keeper) MarshalRebalanceCallbackArgs(ctx sdk.Context, rebalanceCallback func (k Keeper) UnmarshalRebalanceCallbackArgs(ctx sdk.Context, rebalanceCallback []byte) (*types.RebalanceCallback, error) { unmarshalledRebalanceCallback := types.RebalanceCallback{} if err := proto.Unmarshal(rebalanceCallback, &unmarshalledRebalanceCallback); err != nil { - k.Logger(ctx).Error(fmt.Sprintf("UnmarshalRebalanceCallbackArgs %v", err.Error())) - return nil, err + return nil, errorsmod.Wrap(err, "unable to unmarshal rebalance callback args") } return &unmarshalledRebalanceCallback, nil } @@ -41,7 +40,7 @@ func (k Keeper) RebalanceCallback(ctx sdk.Context, packet channeltypes.Packet, a // Fetch callback args rebalanceCallback, err := k.UnmarshalRebalanceCallbackArgs(ctx, args) if err != nil { - return errorsmod.Wrapf(types.ErrUnmarshalFailure, fmt.Sprintf("Unable to unmarshal rebalance callback args: %s", err.Error())) + return err } chainId := rebalanceCallback.HostZoneId k.Logger(ctx).Info(utils.LogICACallbackWithHostZone(chainId, ICACallbackID_Rebalance, "Starting rebalance callback")) diff --git a/x/stakeibc/keeper/icacallbacks_rebalance_test.go b/x/stakeibc/keeper/icacallbacks_rebalance_test.go index c0d4d9c6dd..499be39b3a 100644 --- a/x/stakeibc/keeper/icacallbacks_rebalance_test.go +++ b/x/stakeibc/keeper/icacallbacks_rebalance_test.go @@ -205,7 +205,7 @@ func (s *KeeperTestSuite) TestRebalanceCallback_WrongCallbackArgs() { invalidCallbackArgs := []byte("random bytes") err := s.App.StakeibcKeeper.RebalanceCallback(s.Ctx, invalidArgs.packet, invalidArgs.ackResponse, invalidCallbackArgs) - s.Require().EqualError(err, "Unable to unmarshal rebalance callback args: unexpected EOF: unable to unmarshal data structure") + s.Require().ErrorContains(err, "unable to unmarshal rebalance callback args") } func (s *KeeperTestSuite) TestRebalanceCallback_WrongValidator() { diff --git a/x/stakeibc/keeper/icacallbacks_redemption.go b/x/stakeibc/keeper/icacallbacks_redemption.go index cc297d24ff..30fbcc8a74 100644 --- a/x/stakeibc/keeper/icacallbacks_redemption.go +++ b/x/stakeibc/keeper/icacallbacks_redemption.go @@ -29,8 +29,7 @@ func (k Keeper) MarshalRedemptionCallbackArgs(ctx sdk.Context, redemptionCallbac func (k Keeper) UnmarshalRedemptionCallbackArgs(ctx sdk.Context, redemptionCallback []byte) (types.RedemptionCallback, error) { unmarshalledRedemptionCallback := types.RedemptionCallback{} if err := proto.Unmarshal(redemptionCallback, &unmarshalledRedemptionCallback); err != nil { - k.Logger(ctx).Error(fmt.Sprintf("UnmarshalRedemptionCallbackArgs | %s", err.Error())) - return unmarshalledRedemptionCallback, err + return unmarshalledRedemptionCallback, errorsmod.Wrap(err, "unable to unmarshal redemption callback args") } return unmarshalledRedemptionCallback, nil } @@ -43,7 +42,7 @@ func (k Keeper) RedemptionCallback(ctx sdk.Context, packet channeltypes.Packet, // Fetch callback args redemptionCallback, err := k.UnmarshalRedemptionCallbackArgs(ctx, args) if err != nil { - return errorsmod.Wrapf(types.ErrUnmarshalFailure, fmt.Sprintf("Unable to unmarshal redemption callback args: %s", err.Error())) + return err } chainId := redemptionCallback.HostZoneId k.Logger(ctx).Info(utils.LogICACallbackWithHostZone(chainId, ICACallbackID_Redemption, @@ -64,7 +63,7 @@ func (k Keeper) RedemptionCallback(ctx sdk.Context, packet channeltypes.Packet, icacallbackstypes.AckResponseStatus_FAILURE, packet)) // Reset unbondings record status - err = k.RecordsKeeper.SetHostZoneUnbondingStatus(ctx, chainId, redemptionCallback.EpochUnbondingRecordIds, recordstypes.HostZoneUnbonding_EXIT_TRANSFER_QUEUE) + err := k.RecordsKeeper.SetHostZoneUnbondingStatus(ctx, chainId, redemptionCallback.EpochUnbondingRecordIds, recordstypes.HostZoneUnbonding_EXIT_TRANSFER_QUEUE) if err != nil { return err } diff --git a/x/stakeibc/keeper/icacallbacks_redemption_test.go b/x/stakeibc/keeper/icacallbacks_redemption_test.go index 61f87ba568..569212ce01 100644 --- a/x/stakeibc/keeper/icacallbacks_redemption_test.go +++ b/x/stakeibc/keeper/icacallbacks_redemption_test.go @@ -159,7 +159,7 @@ func (s *KeeperTestSuite) TestRedemptionCallback_WrongCallbackArgs() { invalidCallbackArgs := []byte("random bytes") err := s.App.StakeibcKeeper.RedemptionCallback(s.Ctx, invalidArgs.packet, invalidArgs.ackResponse, invalidCallbackArgs) - s.Require().EqualError(err, "Unable to unmarshal redemption callback args: unexpected EOF: unable to unmarshal data structure") + s.Require().ErrorContains(err, "unable to unmarshal redemption callback args: unexpected EOF") s.checkRedemptionStateIfCallbackFailed(tc) } diff --git a/x/stakeibc/keeper/icacallbacks_reinvest.go b/x/stakeibc/keeper/icacallbacks_reinvest.go index 8b4019633f..e971709cf2 100644 --- a/x/stakeibc/keeper/icacallbacks_reinvest.go +++ b/x/stakeibc/keeper/icacallbacks_reinvest.go @@ -36,8 +36,7 @@ func (k Keeper) MarshalReinvestCallbackArgs(ctx sdk.Context, reinvestCallback ty func (k Keeper) UnmarshalReinvestCallbackArgs(ctx sdk.Context, reinvestCallback []byte) (*types.ReinvestCallback, error) { unmarshalledReinvestCallback := types.ReinvestCallback{} if err := proto.Unmarshal(reinvestCallback, &unmarshalledReinvestCallback); err != nil { - k.Logger(ctx).Error(fmt.Sprintf("UnmarshalReinvestCallbackArgs %s", err.Error())) - return nil, err + return nil, errorsmod.Wrap(err, "unable to unmarshal reinvest callback args") } return &unmarshalledReinvestCallback, nil } @@ -53,7 +52,7 @@ func (k Keeper) ReinvestCallback(ctx sdk.Context, packet channeltypes.Packet, ac // Fetch callback args reinvestCallback, err := k.UnmarshalReinvestCallbackArgs(ctx, args) if err != nil { - return errorsmod.Wrapf(types.ErrUnmarshalFailure, fmt.Sprintf("Unable to unmarshal reinvest callback args: %s", err.Error())) + return err } chainId := reinvestCallback.HostZoneId k.Logger(ctx).Info(utils.LogICACallbackWithHostZone(chainId, ICACallbackID_Reinvest, "Starting reinvest callback")) diff --git a/x/stakeibc/keeper/icacallbacks_reinvest_test.go b/x/stakeibc/keeper/icacallbacks_reinvest_test.go index 2744f25db5..3ecb888578 100644 --- a/x/stakeibc/keeper/icacallbacks_reinvest_test.go +++ b/x/stakeibc/keeper/icacallbacks_reinvest_test.go @@ -136,7 +136,7 @@ func (s *KeeperTestSuite) TestReinvestCallback_Successful() { s.Require().Equal(tc.initialState.durationUntilNextEpoch, query.TimeoutDuration, "query timeout duration") } -func (s *KeeperTestSuite) checkReinvestStateIfCallbackFailed(tc ReinvestCallbackTestCase) { +func (s *KeeperTestSuite) checkReinvestStateIfCallbackFailed() { // Confirm deposit record has not been added records := s.App.RecordsKeeper.GetAllDepositRecord(s.Ctx) s.Require().Len(records, 0, "number of deposit records") @@ -151,7 +151,7 @@ func (s *KeeperTestSuite) TestReinvestCallback_ReinvestCallbackTimeout() { err := s.App.StakeibcKeeper.ReinvestCallback(s.Ctx, invalidArgs.packet, invalidArgs.ackResponse, invalidArgs.args) s.Require().NoError(err) - s.checkReinvestStateIfCallbackFailed(tc) + s.checkReinvestStateIfCallbackFailed() } func (s *KeeperTestSuite) TestReinvestCallback_ReinvestCallbackErrorOnHost() { @@ -163,7 +163,7 @@ func (s *KeeperTestSuite) TestReinvestCallback_ReinvestCallbackErrorOnHost() { err := s.App.StakeibcKeeper.ReinvestCallback(s.Ctx, invalidArgs.packet, invalidArgs.ackResponse, invalidArgs.args) s.Require().NoError(err) - s.checkReinvestStateIfCallbackFailed(tc) + s.checkReinvestStateIfCallbackFailed() } func (s *KeeperTestSuite) TestReinvestCallback_WrongCallbackArgs() { @@ -174,7 +174,7 @@ func (s *KeeperTestSuite) TestReinvestCallback_WrongCallbackArgs() { invalidCallbackArgs := []byte("random bytes") err := s.App.StakeibcKeeper.ReinvestCallback(s.Ctx, invalidArgs.packet, invalidArgs.ackResponse, invalidCallbackArgs) - s.Require().EqualError(err, "Unable to unmarshal reinvest callback args: unexpected EOF: unable to unmarshal data structure") + s.Require().ErrorContains(err, "unable to unmarshal reinvest callback args") } func (s *KeeperTestSuite) TestReinvestCallback_HostZoneNotFound() { diff --git a/x/stakeibc/keeper/icacallbacks_undelegate.go b/x/stakeibc/keeper/icacallbacks_undelegate.go index 9876f160b5..d25e59adf8 100644 --- a/x/stakeibc/keeper/icacallbacks_undelegate.go +++ b/x/stakeibc/keeper/icacallbacks_undelegate.go @@ -1,8 +1,6 @@ package keeper import ( - "fmt" - sdkmath "cosmossdk.io/math" "github.com/Stride-Labs/stride/v23/utils" @@ -32,7 +30,7 @@ func (k Keeper) UndelegateCallback(ctx sdk.Context, packet channeltypes.Packet, // Fetch callback args var undelegateCallback types.UndelegateCallback if err := proto.Unmarshal(args, &undelegateCallback); err != nil { - return errorsmod.Wrapf(types.ErrUnmarshalFailure, fmt.Sprintf("Unable to unmarshal undelegate callback args: %s", err.Error())) + return errorsmod.Wrap(err, "unable to unmarshal undelegate callback args") } // Fetch the relevant host zone diff --git a/x/stakeibc/keeper/icacallbacks_undelegate_test.go b/x/stakeibc/keeper/icacallbacks_undelegate_test.go index 4951190020..20d716e4d9 100644 --- a/x/stakeibc/keeper/icacallbacks_undelegate_test.go +++ b/x/stakeibc/keeper/icacallbacks_undelegate_test.go @@ -278,7 +278,7 @@ func (s *KeeperTestSuite) TestUndelegateCallback_WrongCallbackArgs() { invalidCallbackArgs := []byte("random bytes") err := s.App.StakeibcKeeper.UndelegateCallback(s.Ctx, tc.validArgs.packet, tc.validArgs.ackResponse, invalidCallbackArgs) - s.Require().EqualError(err, "Unable to unmarshal undelegate callback args: unexpected EOF: unable to unmarshal data structure") + s.Require().ErrorContains(err, "unable to unmarshal undelegate callback args") } func (s *KeeperTestSuite) TestUndelegateCallback_HostNotFound() {