refactor: use slices.Contains to simplify code (#1254)

Signed-off-by: CoolCu <coolcui@qq.com>

Author: CoolCu

x/amm/keeper/params.go

@@ -7,6 +7,7 @@ import (
 	"github.com/elys-network/elys/x/amm/types"
 	assetprofiletypes "github.com/elys-network/elys/x/assetprofile/types"
 	ptypes "github.com/elys-network/elys/x/parameter/types"
+	"slices"
 )
 
 func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) {
@@ -42,13 +43,7 @@ func (k Keeper) CheckBaseAssetExist(ctx sdk.Context, denom string) bool {
 		}
 	}
 
-	found := false
-	for _, asset := range params.BaseAssets {
-		if asset == denom {
-			found = true
-			break
-		}
-	}
+	found := slices.Contains(params.BaseAssets, denom)
 	return found
 }
 

x/leveragelp/keeper/msg_server_open.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"slices"
 	"strconv"
 
 	errorsmod "cosmossdk.io/errors"
@@ -19,13 +20,7 @@ func (k msgServer) Open(goCtx context.Context, msg *types.MsgOpen) (*types.MsgOp
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	enabledPools := k.GetParams(ctx).EnabledPools
-	found := false
-	for _, poolId := range enabledPools {
-		if poolId == msg.AmmPoolId {
-			found = true
-			break
-		}
-	}
+	found := slices.Contains(enabledPools, msg.AmmPoolId)
 	if !found {
 		return nil, errorsmod.Wrap(types.ErrPoolNotEnabled, fmt.Sprintf("poolId: %d", msg.AmmPoolId))
 	}

x/perpetual/keeper/msg_server_open.go

@@ -3,6 +3,7 @@ package keeper
 import (
 	"context"
 	"fmt"
+	"slices"
 
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -13,13 +14,7 @@ func (k msgServer) Open(goCtx context.Context, msg *types.MsgOpen) (*types.MsgOp
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	enabledPools := k.GetParams(ctx).EnabledPools
-	found := false
-	for _, poolId := range enabledPools {
-		if poolId == msg.PoolId {
-			found = true
-			break
-		}
-	}
+	found := slices.Contains(enabledPools, msg.PoolId)
 	if !found {
 		return nil, errorsmod.Wrap(types.ErrPoolNotEnabled, fmt.Sprintf("poolId: %d", msg.PoolId))
 	}

x/tradeshield/types/message_execute_orders.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	"slices"
 )
 
 var _ sdk.Msg = &MsgExecuteOrders{}
@@ -26,16 +27,12 @@ func (msg *MsgExecuteOrders) ValidateBasic() error {
 	if len(msg.SpotOrderIds) == 0 && len(msg.PerpetualOrderIds) == 0 {
 		return fmt.Errorf("SpotOrderIds and PerpetualOrderIds both are empty")
 	}
-	for _, id := range msg.SpotOrderIds {
-		if id == 0 {
-			return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "spot order ID cannot be zero")
-		}
+	if slices.Contains(msg.SpotOrderIds, 0) {
+		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "spot order ID cannot be zero")
 	}
 
-	for _, id := range msg.PerpetualOrderIds {
-		if id == 0 {
-			return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "perpetual order ID cannot be zero")
-		}
+	if slices.Contains(msg.PerpetualOrderIds, 0) {
+		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "perpetual order ID cannot be zero")
 	}
 
 	return nil

x/tradeshield/types/messages_pending_perpetual_order.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	"fmt"
+	"slices"
 
 	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/math"
@@ -182,10 +183,8 @@ func (msg *MsgCancelPerpetualOrders) ValidateBasic() error {
 	if len(msg.OrderIds) == 0 {
 		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "spot order IDs cannot be empty")
 	}
-	for _, id := range msg.OrderIds {
-		if id == 0 {
-			return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "spot order ID cannot be zero")
-		}
+	if slices.Contains(msg.OrderIds, 0) {
+		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "spot order ID cannot be zero")
 	}
 
 	return nil

x/tradeshield/types/messages_pending_spot_order.go

@@ -5,6 +5,7 @@ import (
 	"cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	"slices"
 )
 
 var _ sdk.Msg = &MsgCreateSpotOrder{}
@@ -124,10 +125,8 @@ func (msg *MsgCancelSpotOrders) ValidateBasic() error {
 	if len(msg.SpotOrderIds) == 0 {
 		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "spot order IDs cannot be empty")
 	}
-	for _, id := range msg.SpotOrderIds {
-		if id == 0 {
-			return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "spot order ID cannot be zero")
-		}
+	if slices.Contains(msg.SpotOrderIds, 0) {
+		return errorsmod.Wrap(sdkerrors.ErrInvalidRequest, "spot order ID cannot be zero")
 	}
 	return nil
 }