Merge branch 'master' into cosmos_upgrade_0.47

DecentralCardGame · Oct 7, 2023 · f32d118 · f32d118
2 parents 08483b3 + 467e685
commit f32d118
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 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_buy_set.go b/x/cardchain/client/cli/tx_buy_set.go
@@ -15,7 +15,7 @@ var _ = strconv.Itoa(0)
 
 func CmdBuyBoosterPack() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "buy-set [set-id]",
+		Use:   "buy-booster-pack [set-id]",
 		Short: "Broadcast message BuyBoosterPack",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {

diff --git a/x/cardchain/client/cli/tx_msg_open_match.go b/x/cardchain/client/cli/tx_msg_open_match.go
@@ -14,7 +14,7 @@ var _ = strconv.Itoa(0)
 
 func CmdMsgOpenMatch() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "msg-open-match",
+		Use:   "open-match",
 		Short: "Broadcast message OpenMatch",
 		Args:  cobra.ExactArgs(0),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {

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 {

diff --git a/x/cardchain/keeper/msg_server_finalize_set.go b/x/cardchain/keeper/msg_server_finalize_set.go
@@ -2,7 +2,6 @@ package keeper
 
 import (
 	"context"
-	"fmt"
 
 	sdkerrors "cosmossdk.io/errors"
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
@@ -21,6 +20,12 @@ func (k msgServer) FinalizeSet(goCtx context.Context, msg *types.MsgFinalizeSet)
 		return nil, err
 	}
 
+	image := k.Images.Get(ctx, set.ArtworkId)
+
+	if len(image.Image) == 0 {
+		return nil, sdkerrors.Wrapf(types.ErrFinalizeSet, "Set artwork is needed")
+	}
+
 	err = k.CollectSetCreationFee(ctx, msg.Creator)
 	if err != nil {
 		return nil, sdkerrors.Wrap(errors.ErrInsufficientFunds, err.Error())
@@ -32,7 +37,7 @@ func (k msgServer) FinalizeSet(goCtx context.Context, msg *types.MsgFinalizeSet)
 	}
 
 	if dist[0] != dist[1] {
-		return nil, fmt.Errorf("sets should contain [(common,unique,exceptional), uncommon, rare] %d, %d, %d but contains %d, %d, %d", dist[1][0], dist[1][1], dist[1][2], dist[0][0], dist[0][1], dist[0][2])
+		return nil, sdkerrors.Wrapf(types.ErrFinalizeSet, "Sets should contain [(common,unique,exceptional), uncommon, rare] %d, %d, %d but contains %d, %d, %d", dist[1][0], dist[1][1], dist[1][2], dist[0][0], dist[0][1], dist[0][2])
 	}
 
 	set.Status = types.CStatus_finalized

diff --git a/x/cardchain/types/errors.go b/x/cardchain/types/errors.go
@@ -32,4 +32,5 @@ var (
 	ErrUserAlreadyExists       = sdkerrors.Register(ModuleName, 22, "User already exists")
 	ErrWaitingForPlayers       = sdkerrors.Register(ModuleName, 23, "Waiting for players")
 	ErrUninitializedType       = sdkerrors.Register(ModuleName, 24, "Type not yet initialized")
+	ErrFinalizeSet             = sdkerrors.Register(ModuleName, 24, "Set can't be finalized")
 )