simplify IsManualMintingEnabled

app/decorators/inflation_disable_minting.go

@@ -51,7 +51,9 @@ func (mfd MsgManualMintFilterDecorator) hasInvalidMsgFromPoAAdmin(ctx sdk.Contex
 
 func (mfd MsgManualMintFilterDecorator) senderAdminOnMintWithInflation(ctx context.Context, sender string) error {
 	if mfd.isSudoAdminFunc(ctx, sender) {
-		return mfd.mk.IsManualMintingEnabled(ctx)
+		if !mfd.mk.IsManualMintingEnabled(ctx) {
+			return manifesttypes.ErrManualMintingDisabled
+		}
 	}
 
 	return nil

app/decorators/inflation_disable_test.go

@@ -104,13 +104,13 @@ func (s *AnteTestSuite) TestAnteInflationAndMinting() {
 			name:      "fail; inflation enabled, no manual mint from admin",
 			inflation: true,
 			msg:       tokenfactorytypes.NewMsgMint(poaAdmin.String(), coin),
-			err:       manifestkeeper.ErrManualMintingDisabled.Error(),
+			err:       manifesttypes.ErrManualMintingDisabled.Error(),
 		},
 		{
 			name:      "fail; inflation enabled, no manual payout from admin",
 			inflation: true,
 			msg:       manifesttypes.NewMsgPayoutStakeholders(poaAdmin, coin),
-			err:       manifestkeeper.ErrManualMintingDisabled.Error(),
+			err:       manifesttypes.ErrManualMintingDisabled.Error(),
 		},
 	}
 

x/manifest/keeper/keeper.go

@@ -96,17 +96,13 @@ func (k *Keeper) GetShareHolders(ctx context.Context) []*types.StakeHolders {
 }
 
 // IsManualMintingEnabled returns nil if inflation mint is 0% (disabled)
-func (k Keeper) IsManualMintingEnabled(ctx context.Context) error {
+func (k Keeper) IsManualMintingEnabled(ctx context.Context) bool {
 	params, err := k.Params.Get(ctx)
 	if err != nil {
-		return err
-	}
-
-	if !params.Inflation.AutomaticEnabled {
-		return nil
+		panic(err)
 	}
 
-	return ErrManualMintingDisabled.Wrapf("token inflation: %d", params.Inflation.YearlyAmount)
+	return !params.Inflation.AutomaticEnabled
 }
 
 // Returns the amount of coins to be distributed to the holders

x/manifest/types/errors.go

@@ -0,0 +1,10 @@
+package types
+
+import (
+	"cosmossdk.io/errors"
+)
+
+var (
+	ErrGettingMinter         = errors.Register(ModuleName, 1, "getting minter in ante handler")
+	ErrManualMintingDisabled = errors.Register(ModuleName, 2, "manual minting is disabled due to automatic inflation being on")
+)