Merge pull request #145 from DecentralCardGame/144-fix-openpack-error

Fixed cli tx_set_card_rarity
DecentralCardGame · Oct 7, 2023 · 9f95b09 · 9f95b09
2 parents 8c37732 + 9f0d536
commit 9f95b09
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/scripts/migrate_with_data.py b/scripts/migrate_with_data.py
@@ -40,8 +40,8 @@
 
 
 # delete all sets           # TODO REMOVE THIS PART ONCE EVERYTHING IS FINE
-print(old_dict["app_state"]["cardchain"]["sets"])
-old_dict["app_state"]["cardchain"]["sets"] = []
+#print(old_dict["app_state"]["cardchain"]["sets"])
+#old_dict["app_state"]["cardchain"]["sets"] = []
 
 
 params = new_dict["app_state"]["cardchain"]["params"]

diff --git a/x/cardchain/client/cli/tx_set_card_rarity.go b/x/cardchain/client/cli/tx_set_card_rarity.go
@@ -1,7 +1,7 @@
 package cli
 
 import (
-	"github.com/DecentralCardGame/cardobject/cardobject"
+	"fmt"
 	"strconv"
 
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
@@ -10,6 +10,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
+	"golang.org/x/exp/maps"
 )
 
 var _ = strconv.Itoa(0)
@@ -28,17 +29,12 @@ func CmdSetCardRarity() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			rar, err := strconv.Atoi(args[2])
-			if err != nil {
-				return err
+			rar, found := types.CardRarity_value[args[2]]
+			if (!found) {
+				return fmt.Errorf("Rarity has to be in %s", maps.Keys(types.CardRarity_value))
 			}
-			argRarity := types.CardRarity(rar)
 
-			rarity := cardobject.Rarity(argRarity)
-			err = rarity.ValidateType(cardobject.Card{})
-			if err != nil {
-				return err
-			}
+			argRarity := types.CardRarity(rar)
 
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {