Skip to content

Commit

Permalink
Merge PR #6777: update NewABCIMessageLog to take uint32, update Unsaf…
Browse files Browse the repository at this point in the history
…ePackAny comment
  • Loading branch information
clevinson authored Jul 18, 2020
1 parent 5a5a402 commit 8dcae70
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion baseapp/baseapp.go
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ func (app *BaseApp) runMsgs(ctx sdk.Context, msgs []sdk.Msg, mode runTxMode) (*s
events = events.AppendEvents(msgEvents)

txData.Data = append(txData.Data, &sdk.MsgData{MsgType: msg.Type(), Data: msgResult.Data})
msgLogs = append(msgLogs, sdk.NewABCIMessageLog(uint16(i), msgResult.Log, msgEvents))
msgLogs = append(msgLogs, sdk.NewABCIMessageLog(uint32(i), msgResult.Log, msgEvents))
}

data, err := proto.Marshal(txData)
Expand Down
2 changes: 1 addition & 1 deletion codec/types/any.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func (any *Any) Pack(x proto.Message) error {
// in the case of a packing failure, keeps the cached value. This should only
// be used in situations where compatibility is needed with amino. Amino-only
// values can safely be packed using this method when they will only be
// marshaled with amino and not protobuf
// marshaled with amino and not protobuf.
func UnsafePackAny(x interface{}) *Any {
if msg, ok := x.(proto.Message); ok {
any, err := NewAnyWithValue(msg)
Expand Down
4 changes: 2 additions & 2 deletions types/result.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ func (r Result) GetEvents() Events {
// ABCIMessageLogs represents a slice of ABCIMessageLog.
type ABCIMessageLogs []ABCIMessageLog

func NewABCIMessageLog(i uint16, log string, events Events) ABCIMessageLog {
func NewABCIMessageLog(i uint32, log string, events Events) ABCIMessageLog {
return ABCIMessageLog{
MsgIndex: uint32(i),
MsgIndex: i,
Log: log,
Events: StringifyEvents(events.ToABCIEvents()),
}
Expand Down

0 comments on commit 8dcae70

Please sign in to comment.