chore: address the pr comments

x/uibc/errors.go

@@ -8,7 +8,4 @@ var (
 	ErrIBCPauseStatus     = sdkerrors.Register(ModuleName, 1, "invalid ibc pause status")
 	ErrQuotaExceeded      = sdkerrors.Register(ModuleName, 2, "quota transfer exceeded")
 	ErrNoQuotaForIBCDenom = sdkerrors.Register(ModuleName, 3, "no quota for ibc denom")
-	ErrInvalidIBCDenom    = sdkerrors.Register(ModuleName, 4, "invalid ibc denom")
-	ErrInvalidQuota       = sdkerrors.Register(ModuleName, 5, "invalid quota")
-	ErrInvalidAmount      = sdkerrors.Register(ModuleName, 6, "invalid transfer amount")
 )

x/uibc/module/abci.go

@@ -8,35 +8,16 @@ import (
 
 // BeginBlock implements BeginBlock for the x/uibc module.
 func BeginBlock(ctx sdk.Context, keeper keeper.Keeper) {
-	params := keeper.GetParams(ctx)
 	quotaExpires, err := keeper.GetExpire(ctx)
 	if err != nil {
 		panic(err)
 	}
 
 	// reset quotas
 	if quotaExpires == nil || quotaExpires.Before(ctx.BlockTime()) {
-		newExpires := ctx.BlockTime().Add(params.QuotaDuration)
-		if err := keeper.SetExpire(ctx, newExpires); err != nil {
+		if err := keeper.ResetQuota(ctx); err != nil {
 			panic(err)
 		}
-		if err := keeper.SetTotalOutflowSum(ctx, sdk.NewDec(0)); err != nil {
-			panic(err)
-		}
-
-		quotaOfIBCDenoms, err := keeper.GetQuotaOfIBCDenoms(ctx)
-		if err != nil {
-			panic(err)
-		}
-
-		for _, quotaOfIBCDenom := range quotaOfIBCDenoms {
-			// reset the outflow sum to 0
-			quotaOfIBCDenom.OutflowSum = sdk.NewDec(0)
-			// storing the rate limits to store
-			if err := keeper.SetDenomQuota(ctx, quotaOfIBCDenom); err != nil {
-				panic(err)
-			}
-		}
 	}
 }
 

x/uibc/msg.go

@@ -14,10 +14,10 @@ var (
 	_ sdk.Msg = &MsgGovSetIBCPause{}
 )
 
-// GetTitle returns the title of the proposal.
+// GetTitle implements govv1b1.Content interface.
 func (msg *MsgGovUpdateQuota) GetTitle() string { return msg.Title }
 
-// GetDescription returns the description of the proposal.
+// GetDescription implements govv1b1.Content interface.
 func (msg *MsgGovUpdateQuota) GetDescription() string { return msg.Description }
 
 // Route implements Msg
@@ -39,11 +39,11 @@ func (msg *MsgGovUpdateQuota) ValidateBasic() error {
 	}
 
 	if msg.Total.IsNil() || !msg.Total.IsPositive() {
-		return ErrInvalidQuota.Wrap("total quota must be positive")
+		return sdkerrors.ErrInvalidRequest.Wrap("total quota must be positive")
 	}
 
 	if msg.PerDenom.IsNil() || !msg.PerDenom.IsPositive() {
-		return ErrInvalidQuota.Wrap("quota per denom must be positive")
+		return sdkerrors.ErrInvalidRequest.Wrap("quota per denom must be positive")
 	}
 
 	return checkers.ValidateProposal(msg.Title, msg.Description, msg.Authority)
@@ -70,10 +70,10 @@ func NewUpdateIBCTransferPauseStatus(authority, title, description string,
 	}
 }
 
-// GetTitle returns the title of the proposal.
+// GetTitle implements govv1b1.Content interface.
 func (msg *MsgGovSetIBCPause) GetTitle() string { return msg.Title }
 
-// GetDescription returns the description of the proposal.
+// GetDescription implements govv1b1.Content interface.
 func (msg *MsgGovSetIBCPause) GetDescription() string { return msg.Description }
 
 // Route implements Msg
@@ -118,7 +118,7 @@ func (q *Quota) Validate() error {
 	}
 
 	if q.OutflowSum.IsNil() || q.OutflowSum.IsNegative() {
-		return ErrInvalidQuota.Wrap("ibc denom quota expires shouldn't be empty")
+		return sdkerrors.ErrInvalidRequest.Wrap("ibc denom quota expires shouldn't be empty")
 	}
 
 	return nil

x/uibc/quota/ibc_module.go

@@ -153,7 +153,7 @@ func (im IBCMiddleware) RevertSentPacket(
 
 	amount, ok := sdkmath.NewIntFromString(data.Amount)
 	if !ok {
-		return uibc.ErrInvalidAmount.Wrapf("amount %s", data.Amount)
+		return sdkerrors.ErrInvalidRequest.Wrapf("invalid transfer amount %s", data.Amount)
 	}
 
 	return im.keeper.UndoUpdateQuota(

x/uibc/quota/keeper/grpc_query.go

@@ -5,8 +5,6 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/umee-network/umee/v4/x/uibc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 )
 
 var _ uibc.QueryServer = Querier{}
@@ -24,10 +22,6 @@ func NewQuerier(k Keeper) Querier {
 func (q Querier) Params(goCtx context.Context, req *uibc.QueryParams) (
 	*uibc.QueryParamsResponse, error,
 ) {
-	if req == nil {
-		return nil, status.Error(codes.InvalidArgument, "empty request")
-	}
-
 	ctx := sdk.UnwrapSDKContext(goCtx)
 	params := q.Keeper.GetParams(ctx)
 
@@ -38,10 +32,6 @@ func (q Querier) Params(goCtx context.Context, req *uibc.QueryParams) (
 func (q Querier) Quota(goCtx context.Context, req *uibc.QueryQuota) (
 	*uibc.QueryQuotaResponse, error,
 ) {
-	if req == nil {
-		return nil, status.Error(codes.InvalidArgument, "empty request")
-	}
-
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	if len(req.Denom) == 0 {

x/uibc/quota/keeper/quota.go

@@ -127,6 +127,35 @@ func (k Keeper) GetExpire(ctx sdk.Context) (*time.Time, error) {
 	return &quotaExpires, nil
 }
 
+// ResetQuota will reset the ibc-transfer quotas
+func (k Keeper) ResetQuota(ctx sdk.Context) error {
+	qd := k.GetParams(ctx).QuotaDuration
+	newExpires := ctx.BlockTime().Add(qd)
+	if err := k.SetExpire(ctx, newExpires); err != nil {
+		return err
+	}
+
+	if err := k.SetTotalOutflowSum(ctx, sdk.NewDec(0)); err != nil {
+		return err
+	}
+
+	quotaOfIBCDenoms, err := k.GetQuotaOfIBCDenoms(ctx)
+	if err != nil {
+		return err
+	}
+
+	for _, quotaOfIBCDenom := range quotaOfIBCDenoms {
+		// reset the outflow sum to 0
+		quotaOfIBCDenom.OutflowSum = sdk.NewDec(0)
+		// storing the rate limits to store
+		if err := k.SetDenomQuota(ctx, quotaOfIBCDenom); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // CheckAndUpdateQuota checks the quota of ibc-transfer of denom
 func (k Keeper) CheckAndUpdateQuota(ctx sdk.Context, denom string, amount sdkmath.Int) error {
 	params := k.GetParams(ctx)

x/uibc/quota/keeper/relay.go

@@ -6,8 +6,6 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
 	ibcexported "github.com/cosmos/ibc-go/v5/modules/core/exported"
-
-	"github.com/umee-network/umee/v4/x/uibc"
 )
 
 // SendPacket wraps IBC ChannelKeeper's SendPacket function
@@ -19,7 +17,7 @@ func (k Keeper) SendPacket(ctx sdk.Context, chanCap *capabilitytypes.Capability,
 
 	amount, ok := sdkmath.NewIntFromString(funds)
 	if !ok {
-		return uibc.ErrInvalidAmount.Wrapf("amount %s", funds)
+		return sdkerrors.ErrInvalidRequest.Wrapf("invalid transfer amount %s", funds)
 	}
 
 	if err := k.CheckAndUpdateQuota(ctx, denom, amount); err != nil {