fix(#237): Updated commands

DecentralCardGame · Dec 13, 2024 · 29d5ceb · 29d5ceb
1 parent 380ce8a
commit 29d5ceb
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 10 deletions.
diff --git a/x/cardchain/client/cli/tx_encounter_close.go b/x/cardchain/client/cli/tx_encounter_close.go
@@ -15,15 +15,20 @@ var _ = strconv.Itoa(0)
 
 func CmdEncounterClose() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "encounter-close [encounter-id]",
+		Use:   "encounter-close [encounter-id] [user] [won]",
 		Short: "Broadcast message EncounterClose",
-		Args:  cobra.ExactArgs(1),
+		Args:  cobra.ExactArgs(3),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			argEncounterId, err := cast.ToUint64E(args[0])
 			if err != nil {
 				return err
 			}
 
+			argWon, err := cast.ToBoolE(args[2])
+			if err != nil {
+				return err
+			}
+
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err
@@ -32,6 +37,8 @@ func CmdEncounterClose() *cobra.Command {
 			msg := types.NewMsgEncounterClose(
 				clientCtx.GetFromAddress().String(),
 				argEncounterId,
+				args[1],
+				argWon,
 			)
 			if err := msg.ValidateBasic(); err != nil {
 				return err

diff --git a/x/cardchain/client/cli/tx_encounter_create.go b/x/cardchain/client/cli/tx_encounter_create.go
@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"encoding/json"
 	"strconv"
 
 	"github.com/DecentralCardGame/Cardchain/x/cardchain/types"
@@ -14,10 +15,21 @@ var _ = strconv.Itoa(0)
 
 func CmdEncounterCreate() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "encounter-create",
+		Use:   "encounter-create [drawlist] [parameters] [image]",
 		Short: "Broadcast message EncounterCreate",
-		Args:  cobra.ExactArgs(0),
+		Args:  cobra.ExactArgs(3),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
+			var reqDrawlist []uint64
+			err = json.Unmarshal([]byte(args[0]), &reqDrawlist)
+			if err != nil {
+				return err
+			}
+
+			var reqParameters map[string]string
+			err = json.Unmarshal([]byte(args[1]), &reqParameters)
+			if err != nil {
+				return err
+			}
 
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
@@ -26,6 +38,9 @@ func CmdEncounterCreate() *cobra.Command {
 
 			msg := types.NewMsgEncounterCreate(
 				clientCtx.GetFromAddress().String(),
+				reqDrawlist,
+				reqParameters,
+				[]byte(args[1]),
 			)
 			if err := msg.ValidateBasic(); err != nil {
 				return err

diff --git a/x/cardchain/client/cli/tx_encounter_do.go b/x/cardchain/client/cli/tx_encounter_do.go
@@ -15,9 +15,9 @@ var _ = strconv.Itoa(0)
 
 func CmdEncounterDo() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "encounter-do [encounter-id]",
+		Use:   "encounter-do [encounter-id] [user]",
 		Short: "Broadcast message EncounterDo",
-		Args:  cobra.ExactArgs(1),
+		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			argEncounterId, err := cast.ToUint64E(args[0])
 			if err != nil {
@@ -32,6 +32,7 @@ func CmdEncounterDo() *cobra.Command {
 			msg := types.NewMsgEncounterDo(
 				clientCtx.GetFromAddress().String(),
 				argEncounterId,
+				args[1],
 			)
 			if err := msg.ValidateBasic(); err != nil {
 				return err

diff --git a/x/cardchain/types/message_encounter_close.go b/x/cardchain/types/message_encounter_close.go
@@ -9,10 +9,12 @@ const TypeMsgEncounterClose = "encounter_close"
 
 var _ sdk.Msg = &MsgEncounterClose{}
 
-func NewMsgEncounterClose(creator string, encounterId uint64) *MsgEncounterClose {
+func NewMsgEncounterClose(creator string, encounterId uint64, user string, won bool) *MsgEncounterClose {
 	return &MsgEncounterClose{
 		Creator:     creator,
 		EncounterId: encounterId,
+		User:        user,
+		Won:         won,
 	}
 }
 

diff --git a/x/cardchain/types/message_encounter_create.go b/x/cardchain/types/message_encounter_create.go
@@ -12,9 +12,12 @@ const TypeMsgEncounterCreate = "encounter_create"
 
 var _ sdk.Msg = &MsgEncounterCreate{}
 
-func NewMsgEncounterCreate(creator string) *MsgEncounterCreate {
+func NewMsgEncounterCreate(creator string, drawlist []uint64, parameters map[string]string, image []byte) *MsgEncounterCreate {
 	return &MsgEncounterCreate{
-		Creator: creator,
+		Creator:    creator,
+		Drawlist:   drawlist,
+		Parameters: parameters,
+		Image:      image,
 	}
 }
 

diff --git a/x/cardchain/types/message_encounter_do.go b/x/cardchain/types/message_encounter_do.go
@@ -9,10 +9,11 @@ const TypeMsgEncounterDo = "encounter_do"
 
 var _ sdk.Msg = &MsgEncounterDo{}
 
-func NewMsgEncounterDo(creator string, encounterId uint64) *MsgEncounterDo {
+func NewMsgEncounterDo(creator string, encounterId uint64, user string) *MsgEncounterDo {
 	return &MsgEncounterDo{
 		Creator:     creator,
 		EncounterId: encounterId,
+		User:        user,
 	}
 }