Revert "eth/filters: reuse handleLogs method for removed logs (#27438)"

This reverts commit dc18557d73.
This commit is contained in:
devopsbo3 2023-11-10 12:27:53 -06:00 committed by GitHub
parent 47cf2fe6f9
commit 73608c0edf

View file

@ -444,6 +444,15 @@ func (es *EventSystem) handlePendingLogs(filters filterIndex, ev []*types.Log) {
} }
} }
func (es *EventSystem) handleRemovedLogs(filters filterIndex, ev core.RemovedLogsEvent) {
for _, f := range filters[LogsSubscription] {
matchedLogs := filterLogs(ev.Logs, f.logsCrit.FromBlock, f.logsCrit.ToBlock, f.logsCrit.Addresses, f.logsCrit.Topics)
if len(matchedLogs) > 0 {
f.logs <- matchedLogs
}
}
}
func (es *EventSystem) handleTxsEvent(filters filterIndex, ev core.NewTxsEvent) { func (es *EventSystem) handleTxsEvent(filters filterIndex, ev core.NewTxsEvent) {
for _, f := range filters[PendingTransactionsSubscription] { for _, f := range filters[PendingTransactionsSubscription] {
f.txs <- ev.Txs f.txs <- ev.Txs
@ -564,7 +573,7 @@ func (es *EventSystem) eventLoop() {
case ev := <-es.logsCh: case ev := <-es.logsCh:
es.handleLogs(index, ev) es.handleLogs(index, ev)
case ev := <-es.rmLogsCh: case ev := <-es.rmLogsCh:
es.handleLogs(index, ev.Logs) es.handleRemovedLogs(index, ev)
case ev := <-es.pendingLogsCh: case ev := <-es.pendingLogsCh:
es.handlePendingLogs(index, ev) es.handlePendingLogs(index, ev)
case ev := <-es.chainCh: case ev := <-es.chainCh: