From aae928bc01dc3b6796a6a70c07ab41cc9f8b3660 Mon Sep 17 00:00:00 2001 From: lxgr-linux Date: Sun, 15 Oct 2023 23:46:56 +0200 Subject: [PATCH] Fixed openmatch args --- x/cardchain/client/cli/tx_msg_open_match.go | 20 ++++++++++++++++++-- x/cardchain/types/message_msg_open_match.go | 6 +++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/x/cardchain/client/cli/tx_msg_open_match.go b/x/cardchain/client/cli/tx_msg_open_match.go index 41ca91c3..c14747d6 100644 --- a/x/cardchain/client/cli/tx_msg_open_match.go +++ b/x/cardchain/client/cli/tx_msg_open_match.go @@ -1,6 +1,7 @@ package cli import ( + "encoding/json" "strconv" "github.com/DecentralCardGame/Cardchain/x/cardchain/types" @@ -14,9 +15,9 @@ var _ = strconv.Itoa(0) func CmdMsgOpenMatch() *cobra.Command { cmd := &cobra.Command{ - Use: "open-match", + Use: "open-match [player-a] [player-b] [player-a-deck] [player-b-deck]", Short: "Broadcast message OpenMatch", - Args: cobra.ExactArgs(0), + Args: cobra.ExactArgs(4), RunE: func(cmd *cobra.Command, args []string) (err error) { clientCtx, err := client.GetClientTxContext(cmd) @@ -24,8 +25,23 @@ func CmdMsgOpenMatch() *cobra.Command { return err } + var argPlayerADeck []uint64 + var argPlayerBDeck []uint64 + err = json.Unmarshal([]byte(args[2]), &argPlayerADeck) + if err != nil { + return err + } + err = json.Unmarshal([]byte(args[3]), &argPlayerBDeck) + if err != nil { + return err + } + msg := types.NewMsgOpenMatch( clientCtx.GetFromAddress().String(), + args[0], + args[1], + argPlayerADeck, + argPlayerBDeck, ) if err := msg.ValidateBasic(); err != nil { return err diff --git a/x/cardchain/types/message_msg_open_match.go b/x/cardchain/types/message_msg_open_match.go index 27ab621d..917a5bc8 100644 --- a/x/cardchain/types/message_msg_open_match.go +++ b/x/cardchain/types/message_msg_open_match.go @@ -9,9 +9,13 @@ const TypeMsgOpenMatch = "msg_open_match" var _ sdk.Msg = &MsgOpenMatch{} -func NewMsgOpenMatch(creator string) *MsgOpenMatch { +func NewMsgOpenMatch(creator string, playerA string, playerB string, playerADeck []uint64, playerBDeck []uint64) *MsgOpenMatch { return &MsgOpenMatch{ Creator: creator, + PlayerA: playerA, + PlayerB: playerB, + PlayerADeck: playerADeck, + PlayerBDeck: playerBDeck, } }