refactor(x/bank): Simplify the return (backport #21602) (#21604)

Co-authored-by: fx0x55 <80245546+fx0x55@users.noreply.github.com>
This commit is contained in:
mergify[bot] 2024-09-09 10:23:54 +00:00 committed by GitHub
parent 01c0e9ba35
commit ec08ea75d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -150,7 +150,7 @@ func (k BaseKeeper) DelegateCoins(ctx context.Context, delegatorAddr, moduleAccA
if err != nil {
return err
}
if err := k.EventService.EventManager(ctx).EmitKV(
if err = k.EventService.EventManager(ctx).EmitKV(
types.EventTypeCoinSpent,
event.NewAttribute(types.AttributeKeySpender, delAddrStr),
event.NewAttribute(sdk.AttributeKeyAmount, amt.String()),
@ -158,12 +158,7 @@ func (k BaseKeeper) DelegateCoins(ctx context.Context, delegatorAddr, moduleAccA
return err
}
err = k.addCoins(ctx, moduleAccAddr, amt)
if err != nil {
return err
}
return nil
return k.addCoins(ctx, moduleAccAddr, amt)
}
// UndelegateCoins performs undelegation by crediting amt coins to an account with
@ -181,8 +176,7 @@ func (k BaseKeeper) UndelegateCoins(ctx context.Context, moduleAccAddr, delegato
return errorsmod.Wrap(sdkerrors.ErrInvalidCoins, amt.String())
}
err := k.subUnlockedCoins(ctx, moduleAccAddr, amt)
if err != nil {
if err := k.subUnlockedCoins(ctx, moduleAccAddr, amt); err != nil {
return err
}
@ -190,12 +184,7 @@ func (k BaseKeeper) UndelegateCoins(ctx context.Context, moduleAccAddr, delegato
return errorsmod.Wrap(err, "failed to track undelegation")
}
err = k.addCoins(ctx, delegatorAddr, amt)
if err != nil {
return err
}
return nil
return k.addCoins(ctx, delegatorAddr, amt)
}
// GetSupply retrieves the Supply from store