make core.MsgID marshallable by protobuf

Signed-off-by: Masanori Yoshida <[email protected]>
hyperledger-labs · Oct 16, 2023 · 38e3889 · 38e3889
1 parent 0a2b77f
commit 38e3889
Show file tree

Hide file tree

Showing 5 changed files with 363 additions and 26 deletions.
diff --git a/chains/tendermint/chain.go b/chains/tendermint/chain.go
@@ -404,8 +404,8 @@ func (c *Chain) SendMsgs(msgs []sdk.Msg) ([]core.MsgID, error) {
 	var msgIDs []core.MsgID
 	for msgIndex := range msgs {
 		msgIDs = append(msgIDs, &MsgID{
-			txHash:   res.TxHash,
-			msgIndex: uint32(msgIndex),
+			TxHash:   res.TxHash,
+			MsgIndex: uint32(msgIndex),
 		})
 	}
 	return msgIDs, nil
@@ -418,7 +418,7 @@ func (c *Chain) GetMsgResult(id core.MsgID) (core.MsgResult, error) {
 	}
 
 	// find tx
-	resTx, err := c.waitForCommit(msgID.txHash)
+	resTx, err := c.waitForCommit(msgID.TxHash)
 	if err != nil {
 		return nil, fmt.Errorf("failed to query tx: %v", err)
 	}
@@ -445,7 +445,7 @@ func (c *Chain) GetMsgResult(id core.MsgID) (core.MsgResult, error) {
 	}
 
 	// parse the ABCI logs into core.MsgEventLog's
-	events, err := parseMsgEventLogs(abciLogs, msgID.msgIndex)
+	events, err := parseMsgEventLogs(abciLogs, msgID.MsgIndex)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse msg event log: %v", err)
 	}

diff --git a/chains/tendermint/msg.go b/chains/tendermint/msg.go
@@ -19,16 +19,7 @@ var (
 	_ core.MsgResult = (*MsgResult)(nil)
 )
 
-type MsgID struct {
-	core.IsMsgID
-
-	txHash   string
-	msgIndex uint32
-}
-
-func (i *MsgID) String() string {
-	return fmt.Sprintf("%s:%d", i.txHash, i.msgIndex)
-}
+func (*MsgID) Is_MsgID() {}
 
 type MsgResult struct {
 	height clienttypes.Height

diff --git a/chains/tendermint/msgid.pb.go b/chains/tendermint/msgid.pb.go