Skip to content

Commit

Permalink
review changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@atheeshp
atheeshp committed Feb 20, 2024
1 parent 9f0b6c4 commit 664dc18
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 31 deletions.
18 changes: 9 additions & 9 deletions ante/fee.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/cosmos/cosmos-sdk/types/errors"

sdkerrors "cosmossdk.io/errors"
errorsmod "cosmossdk.io/errors"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/cosmos/cosmos-sdk/x/auth/types"
Expand Down Expand Up @@ -40,11 +40,11 @@ func NewDeductFeeDecorator(ak ante.AccountKeeper, bk BankKeeper, fk ante.Feegran
func (dfd DeductFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (sdk.Context, error) {
feeTx, ok := tx.(sdk.FeeTx)
if !ok {
return ctx, sdkerrors.Wrap(errors.ErrTxDecode, "Tx must be a FeeTx")
return ctx, errorsmod.Wrap(errors.ErrTxDecode, "Tx must be a FeeTx")
}

if !simulate && ctx.BlockHeight() > 0 && feeTx.GetGas() == 0 {
return ctx, sdkerrors.Wrap(errors.ErrInvalidGasLimit, "must provide positive gas")
return ctx, errorsmod.Wrap(errors.ErrInvalidGasLimit, "must provide positive gas")
}

var (
Expand Down Expand Up @@ -84,7 +84,7 @@ func (dfd DeductFeeDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bo
func (dfd DeductFeeDecorator) checkDeductFee(ctx sdk.Context, sdkTx sdk.Tx, fee sdk.Coins) error {
feeTx, ok := sdkTx.(sdk.FeeTx)
if !ok {
return sdkerrors.Wrap(errors.ErrTxDecode, "Tx must be a FeeTx")
return errorsmod.Wrap(errors.ErrTxDecode, "Tx must be a FeeTx")
}

if addr := dfd.accountKeeper.GetModuleAddress(types.FeeCollectorName); addr == nil {
Expand All @@ -103,7 +103,7 @@ func (dfd DeductFeeDecorator) checkDeductFee(ctx sdk.Context, sdkTx sdk.Tx, fee
} else if !feeGranter.Equals(feePayer) {
err := dfd.feegrantKeeper.UseGrantedFees(ctx, feeGranter, feePayer, fee, sdkTx.GetMsgs())
if err != nil {
return sdkerrors.Wrapf(err, "%s does not not allow to pay fees for %s", feeGranter, feePayer)
return errorsmod.Wrapf(err, "%s does not not allow to pay fees for %s", feeGranter, feePayer)
}
}

Expand Down Expand Up @@ -138,12 +138,12 @@ func (dfd DeductFeeDecorator) checkDeductFee(ctx sdk.Context, sdkTx sdk.Tx, fee
// DeductFees deducts fees from the given account.
func DeductFees(bankKeeper types.BankKeeper, ctx sdk.Context, acc types.AccountI, fees sdk.Coins) error {
if !fees.IsValid() {
return sdkerrors.Wrapf(errors.ErrInsufficientFee, "invalid fee amount: %s", fees)
return errorsmod.Wrapf(errors.ErrInsufficientFee, "invalid fee amount: %s", fees)
}

err := bankKeeper.SendCoinsFromAccountToModule(ctx, acc.GetAddress(), types.FeeCollectorName, fees)
if err != nil {
return sdkerrors.Wrapf(errors.ErrInsufficientFunds, err.Error())
return errorsmod.Wrapf(errors.ErrInsufficientFunds, err.Error())
}

return nil
Expand All @@ -152,7 +152,7 @@ func DeductFees(bankKeeper types.BankKeeper, ctx sdk.Context, acc types.AccountI
func IsSufficientFee(ctx sdk.Context, tax, reward, burn, feeProvided sdk.Coins, gasRequested int64) (bool, int64, error) {
// check if the provided fee is enough for `did`, `resource` module specific Msg
if !feeProvided.IsAnyGTE(tax) {
return false, 0, sdkerrors.Wrapf(errors.ErrInsufficientFee, "insufficient fees; got: %s required: %s", feeProvided, tax)
return false, 0, errorsmod.Wrapf(errors.ErrInsufficientFee, "insufficient fees; got: %s required: %s", feeProvided, tax)
}

// check with the default validator min gas prices based on rewards distribution
Expand All @@ -171,7 +171,7 @@ func IsSufficientFee(ctx sdk.Context, tax, reward, burn, feeProvided sdk.Coins,

// check if the fee is sufficient
if !reward.IsAnyGTE(requiredFees) {
return false, 0, sdkerrors.Wrapf(errors.ErrInsufficientFee, "insufficient fees; got: %s required: %s", reward, requiredFees)
return false, 0, errorsmod.Wrapf(errors.ErrInsufficientFee, "insufficient fees; got: %s required: %s", reward, requiredFees)
}
}
}
Expand Down
26 changes: 13 additions & 13 deletions x/did/types/error.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ package types
// DONTCOVER

import (
sdkerrors "cosmossdk.io/errors"
errorsmod "cosmossdk.io/errors"
)

// x/cheqd module sentinel errors
var (
ErrBadRequest = sdkerrors.Register(ModuleName, 1000, "bad request")
ErrInvalidSignature = sdkerrors.Register(ModuleName, 1100, "invalid signature detected")
ErrSignatureNotFound = sdkerrors.Register(ModuleName, 1101, "signature is required but not found")
ErrDidDocExists = sdkerrors.Register(ModuleName, 1200, "DID Doc exists")
ErrDidDocNotFound = sdkerrors.Register(ModuleName, 1201, "DID Doc not found")
ErrVerificationMethodNotFound = sdkerrors.Register(ModuleName, 1202, "verification method not found")
ErrUnexpectedDidVersion = sdkerrors.Register(ModuleName, 1203, "unexpected DID version")
ErrBasicValidation = sdkerrors.Register(ModuleName, 1205, "basic validation failed")
ErrNamespaceValidation = sdkerrors.Register(ModuleName, 1206, "DID namespace validation failed")
ErrDIDDocDeactivated = sdkerrors.Register(ModuleName, 1207, "DID Doc already deactivated")
ErrUnpackStateValue = sdkerrors.Register(ModuleName, 1300, "invalid did state value")
ErrInternal = sdkerrors.Register(ModuleName, 1500, "internal error")
ErrBadRequest = errorsmod.Register(ModuleName, 1000, "bad request")
ErrInvalidSignature = errorsmod.Register(ModuleName, 1100, "invalid signature detected")
ErrSignatureNotFound = errorsmod.Register(ModuleName, 1101, "signature is required but not found")
ErrDidDocExists = errorsmod.Register(ModuleName, 1200, "DID Doc exists")
ErrDidDocNotFound = errorsmod.Register(ModuleName, 1201, "DID Doc not found")
ErrVerificationMethodNotFound = errorsmod.Register(ModuleName, 1202, "verification method not found")
ErrUnexpectedDidVersion = errorsmod.Register(ModuleName, 1203, "unexpected DID version")
ErrBasicValidation = errorsmod.Register(ModuleName, 1205, "basic validation failed")
ErrNamespaceValidation = errorsmod.Register(ModuleName, 1206, "DID namespace validation failed")
ErrDIDDocDeactivated = errorsmod.Register(ModuleName, 1207, "DID Doc already deactivated")
ErrUnpackStateValue = errorsmod.Register(ModuleName, 1300, "invalid did state value")
ErrInternal = errorsmod.Register(ModuleName, 1500, "internal error")
)
18 changes: 9 additions & 9 deletions x/resource/types/error.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ package types
// DONTCOVER

import (
sdkerrors "cosmossdk.io/errors"
errorsmod "cosmossdk.io/errors"
)

// x/resource module sentinel errors
var (
ErrBadRequest = sdkerrors.Register(ModuleName, 2000, "bad request")
ErrResourceExists = sdkerrors.Register(ModuleName, 2200, "Resource exists")
ErrBasicValidation = sdkerrors.Register(ModuleName, 2205, "basic validation failed")
ErrInternal = sdkerrors.Register(ModuleName, 2500, "internal error")
ErrInvalidVersion = sdkerrors.Register(ModuleName, 2505, "invalid ibc version")
ErrUnexpectedAck = sdkerrors.Register(ModuleName, 2510, "resource module never sends packets")
ErrUnexpectedPacket = sdkerrors.Register(ModuleName, 2515, "IBC packet is incorrect")
ErrResourceNotAvail = sdkerrors.Register(ModuleName, 2525, "resource not available")
ErrBadRequest = errorsmod.Register(ModuleName, 2000, "bad request")
ErrResourceExists = errorsmod.Register(ModuleName, 2200, "Resource exists")
ErrBasicValidation = errorsmod.Register(ModuleName, 2205, "basic validation failed")
ErrInternal = errorsmod.Register(ModuleName, 2500, "internal error")
ErrInvalidVersion = errorsmod.Register(ModuleName, 2505, "invalid ibc version")
ErrUnexpectedAck = errorsmod.Register(ModuleName, 2510, "resource module never sends packets")
ErrUnexpectedPacket = errorsmod.Register(ModuleName, 2515, "IBC packet is incorrect")
ErrResourceNotAvail = errorsmod.Register(ModuleName, 2525, "resource not available")
)

0 comments on commit 664dc18

Please sign in to comment.