From da95e169c5239abc1b09281f94f1f9d1e02ab901 Mon Sep 17 00:00:00 2001
From: lxgr-linux <lxgr@protonmail.com>
Date: Wed, 27 Sep 2023 16:49:18 +0200
Subject: [PATCH] Added Validation for set card rarity

---
 x/cardchain/client/cli/tx_set_card_rarity.go     | 7 +++++++
 x/cardchain/keeper/msg_server_set_card_rarity.go | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/x/cardchain/client/cli/tx_set_card_rarity.go b/x/cardchain/client/cli/tx_set_card_rarity.go
index 1293d310..a7af339f 100644
--- a/x/cardchain/client/cli/tx_set_card_rarity.go
+++ b/x/cardchain/client/cli/tx_set_card_rarity.go
@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"github.com/DecentralCardGame/cardobject/cardobject"
 	"strconv"
 
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
@@ -29,6 +30,12 @@ func CmdSetCardRarity() *cobra.Command {
 			}
 			argRarity := args[2]
 
+			rarity := cardobject.Rarity(argRarity)
+			err = rarity.ValidateType(cardobject.Card{})
+			if err != nil {
+				return err
+			}
+
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err
diff --git a/x/cardchain/keeper/msg_server_set_card_rarity.go b/x/cardchain/keeper/msg_server_set_card_rarity.go
index 4a3b3aac..473f953f 100644
--- a/x/cardchain/keeper/msg_server_set_card_rarity.go
+++ b/x/cardchain/keeper/msg_server_set_card_rarity.go
@@ -30,6 +30,11 @@ func (k msgServer) SetCardRarity(goCtx context.Context, msg *types.MsgSetCardRar
 	}
 
 	rarity := cardobject.Rarity(msg.Rarity)
+	err = rarity.ValidateType(cardobj)
+	if err != nil {
+		return nil, sdkerrors.Wrap(types.ErrCardobject, err.Error())
+	}
+	
 	if cardobj.Action != nil {
 		cardobj.Action.Rarity = &rarity
 	} else if cardobj.Place != nil {