mleku/wasmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify filter method

Browse Source
This commit is contained in:
Ethan Frey
2021-08-12 14:49:43 +02:00
parent f51ec67099
commit 7fbf513d71
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
x/wasm/keeper/msg_dispatcher.go
View File

@@ -102,7 +102,7 @@ func (d MessageDispatcher) DispatchSubmessages(ctx sdk.Context, contractAddr sdk
var filteredEvents []sdk.Event var filteredEvents []sdk.Event
if err == nil { if err == nil {
commit() commit()
filteredEvents = filterEvents(em.Events(), events) filteredEvents = filterEvents(append(em.Events(), events...))
ctx.EventManager().EmitEvents(filteredEvents) ctx.EventManager().EmitEvents(filteredEvents)
} // on failure, revert state from sandbox, and ignore events (just skip doing the above) } // on failure, revert state from sandbox, and ignore events (just skip doing the above)
@@ -154,19 +154,12 @@ func (d MessageDispatcher) DispatchSubmessages(ctx sdk.Context, contractAddr sdk
return rsp, nil return rsp, nil
} }
func filterEvents(events ...[]sdk.Event) []sdk.Event { func filterEvents(events []sdk.Event) []sdk.Event {
// pre-allocate space for efficiency // pre-allocate space for efficiency
cap := 0 res := make([]sdk.Event, 0, len(events))
for _, evts := range events { for _, ev := range events {
cap += len(evts) if ev.Type != "message" {
} res = append(res, ev)
res := make([]sdk.Event, 0, cap)
for _, evts := range events {
for _, ev := range evts {
if ev.Type != "message" {
res = append(res, ev)
}
} }
} }
return res return res