mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-19 06:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge fixups

Browse Source
This commit is contained in:
William Banfield
2022-03-01 14:52:42 -05:00
parent fafdc320b0
commit 95b6c7ab77
3 changed files with 12 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
types/events.go
+3 -3
View File
@@ -132,7 +132,7 @@ type EventDataNewBlock struct {
func (EventDataNewBlock) TypeTag() string { return "tendermint/event/NewBlock" }
// ABCIEvents implements the eventlog.ABCIEventer interface.
func (e EventDataNewBlock) ABCIEvents() []abci.Event { return e.ResultFinalizeBlock.Events }
func (e EventDataNewBlock) ABCIEvents() []abci.Event { return e.ResultFinalizeBlock.BlockEvents }
type EventDataNewBlockHeader struct {
Header Header `json:"header"`
@@ -145,7 +145,7 @@ type EventDataNewBlockHeader struct {
func (EventDataNewBlockHeader) TypeTag() string { return "tendermint/event/NewBlockHeader" }
// ABCIEvents implements the eventlog.ABCIEventer interface.
func (e EventDataNewBlockHeader) ABCIEvents() []abci.Event { return e.ResultFinalizeBlock.Events }
func (e EventDataNewBlockHeader) ABCIEvents() []abci.Event { return e.ResultFinalizeBlock.BlockEvents }
type EventDataNewEvidence struct {
Evidence Evidence `json:"evidence"`
@@ -170,7 +170,7 @@ func (e EventDataTx) ABCIEvents() []abci.Event {
eventWithAttr(TxHashKey, fmt.Sprintf("%X", Tx(e.Tx).Hash())),
eventWithAttr(TxHeightKey, fmt.Sprintf("%d", e.Height)),
}
return append(base, e.Result.Events...)
return append(base, e.Result.TxEvents...)
}
// NOTE: This goes into the replay WAL