Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small updates to #6713 #6777

Merged
merged 3 commits into from
Jul 18, 2020
Merged

Small updates to #6713 #6777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1aea058
update NewABCIMessageLog to take uint32, update UnsafePackAny comment
clevinson Jul 18, 2020
7bb16fe
Merge branch 'master' into clevinson/updates-to-6713
alexanderbez Jul 18, 2020
30f65b6
Merge branch 'master' into clevinson/updates-to-6713
alexanderbez Jul 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion baseapp/baseapp.go
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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