refactor: consistent error name usage PR comment

NibiruChain · Nov 28, 2023 · 2f0a125 · 2f0a125
1 parent 1b5c836
commit 2f0a125
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/x/perp/v2/keeper/amm.go b/x/perp/v2/keeper/amm.go
@@ -111,7 +111,7 @@ func (k Keeper) handleMarketUpdateCost(
 		)
 		if err != nil {
 			return costPaid, types.ErrNotEnoughFundToPayAction.Wrapf(
-				"not enough fund in perp ef to pay for repeg, need %s got %s",
+				"need %s, got %s",
 				cost.String(),
 				k.BankKeeper.GetBalance(ctx, k.AccountKeeper.GetModuleAddress(types.PerpEFModuleAccount), collateral).String(),
 			)

diff --git a/x/perp/v2/keeper/amm_test.go b/x/perp/v2/keeper/amm_test.go
@@ -214,7 +214,7 @@ func TestUnsafeShiftPegMultiplier_Fail(t *testing.T) {
 
 	// Error because no money in perp ef fund
 	err = app.PerpKeeperV2.Admin.UnsafeShiftPegMultiplier(ctx, pair, sdk.NewDec(3))
-	require.ErrorContains(t, err, "not enough fund in perp ef to pay for repeg")
+	require.ErrorContains(t, err, types.ErrNotEnoughFundToPayAction.Error())
 
 	// Works because it goes in the other way
 	err = app.PerpKeeperV2.Admin.UnsafeShiftPegMultiplier(ctx, pair, sdk.NewDec(1))
@@ -282,11 +282,11 @@ func TestUnsafeShiftSwapInvariant_Fail(t *testing.T) {
 
 	// Error because no money in perp ef fund
 	err = app.PerpKeeperV2.Admin.UnsafeShiftSwapInvariant(ctx, pair, sdk.NewInt(2_000_000))
-	require.ErrorContains(t, err, "not enough fund in perp ef to pay for repeg")
+	require.ErrorContains(t, err, types.ErrNotEnoughFundToPayAction.Error())
 
 	// Fail at validate
 	err = app.PerpKeeperV2.Admin.UnsafeShiftSwapInvariant(ctx, pair, sdk.NewInt(0))
-	require.ErrorContains(t, err, "swap multiplier must be > 0")
+	require.ErrorContains(t, err, types.ErrNonPositivePegMultiplier.Error())
 
 	// Works because it goes in the other way
 	err = app.PerpKeeperV2.Admin.UnsafeShiftSwapInvariant(ctx, pair, sdk.NewInt(500_000))

diff --git a/x/perp/v2/types/errors.go b/x/perp/v2/types/errors.go
@@ -38,8 +38,8 @@ var (
 	ErrLiquidityDepthOverflow   = sdkerrors.Register(ModuleName, 24, "liquidty depth overflow")
 	ErrMarketNotEnabled         = sdkerrors.Register(ModuleName, 25, "market is not enabled, you can only fully close your position")
 	ErrNonPositivePegMultiplier = sdkerrors.Register(ModuleName, 26, "peg multiplier must be > 0")
-	ErrNonPositiveSwapInvariant = sdkerrors.Register(ModuleName, 27, "swap multiplier must be > 0")
-	ErrNilSwapInvariant         = sdkerrors.Register(ModuleName, 28, "swap multiplier must be not nil")
+	ErrNonPositiveSwapInvariant = sdkerrors.Register(ModuleName, 27, "swap invariant must be > 0")
+	ErrNilSwapInvariant         = sdkerrors.Register(ModuleName, 28, "swap invariant must not be nil")
 	ErrNotEnoughFundToPayAction = sdkerrors.Register(ModuleName, 29, "not enough fund in perp EF to pay for action")
 
 	ErrSettlementPositionMarketEnabled   = sdkerrors.Register(ModuleName, 32, "market is enabled, you can only settle position on disabled market")