forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-16 17:03:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update filter_system.go

Browse source
This commit is contained in:
Ragnar 2025-02-28 16:49:10 +01:00 committed by GitHub
parent dd5634ac32
commit a5e54b6b0a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eth/filters/filter_system.go
View file

@ -67,7 +67,6 @@ type Backend interface {
SubscribeNewTxsEvent(chan<- core.NewTxsEvent) event.Subscription SubscribeNewTxsEvent(chan<- core.NewTxsEvent) event.Subscription
SubscribeChainEvent(ch chan<- core.ChainEvent) event.Subscription SubscribeChainEvent(ch chan<- core.ChainEvent) event.Subscription
SubscribeRemovedLogsEvent(ch chan<- core.RemovedLogsEvent) event.Subscription SubscribeRemovedLogsEvent(ch chan<- core.RemovedLogsEvent) event.Subscription
SubscribeRemovedLogsReverseEvent(ch chan<- core.RemovedLogsEvent) event.Subscription
SubscribeLogsEvent(ch chan<- []*types.Log) event.Subscription SubscribeLogsEvent(ch chan<- []*types.Log) event.Subscription
BloomStatus() (uint64, uint64) BloomStatus() (uint64, uint64)
@ -193,7 +192,6 @@ type EventSystem struct {
txsSub event.Subscription // Subscription for new transaction event txsSub event.Subscription // Subscription for new transaction event
logsSub event.Subscription // Subscription for new log event logsSub event.Subscription // Subscription for new log event
rmLogsSub event.Subscription // Subscription for removed log event rmLogsSub event.Subscription // Subscription for removed log event
rmLogsReverseSub event.Subscription // Subscription for removed log event in reverse order
chainSub event.Subscription // Subscription for new chain event chainSub event.Subscription // Subscription for new chain event
// Channels // Channels
@ -202,7 +200,6 @@ type EventSystem struct {
txsCh chan core.NewTxsEvent // Channel to receive new transactions event txsCh chan core.NewTxsEvent // Channel to receive new transactions event
logsCh chan []*types.Log // Channel to receive new log event logsCh chan []*types.Log // Channel to receive new log event
rmLogsCh chan core.RemovedLogsEvent // Channel to receive removed log event rmLogsCh chan core.RemovedLogsEvent // Channel to receive removed log event
rmLogsReverseCh chan core.RemovedLogsEvent // Channel to receive removed log event in reverse order
chainCh chan core.ChainEvent // Channel to receive new chain event chainCh chan core.ChainEvent // Channel to receive new chain event
} }
@ -221,7 +218,6 @@ func NewEventSystem(sys *FilterSystem) *EventSystem {
txsCh: make(chan core.NewTxsEvent, txChanSize), txsCh: make(chan core.NewTxsEvent, txChanSize),
logsCh: make(chan []*types.Log, logsChanSize), logsCh: make(chan []*types.Log, logsChanSize),
rmLogsCh: make(chan core.RemovedLogsEvent, rmLogsChanSize), rmLogsCh: make(chan core.RemovedLogsEvent, rmLogsChanSize),
rmLogsReverseCh: make(chan core.RemovedLogsEvent, rmLogsChanSize),
chainCh: make(chan core.ChainEvent, chainEvChanSize), chainCh: make(chan core.ChainEvent, chainEvChanSize),
} }
@ -229,11 +225,10 @@ func NewEventSystem(sys *FilterSystem) *EventSystem {
m.txsSub = m.backend.SubscribeNewTxsEvent(m.txsCh) m.txsSub = m.backend.SubscribeNewTxsEvent(m.txsCh)
m.logsSub = m.backend.SubscribeLogsEvent(m.logsCh) m.logsSub = m.backend.SubscribeLogsEvent(m.logsCh)
m.rmLogsSub = m.backend.SubscribeRemovedLogsEvent(m.rmLogsCh) m.rmLogsSub = m.backend.SubscribeRemovedLogsEvent(m.rmLogsCh)
m.rmLogsReverseSub = m.backend.SubscribeRemovedLogsReverseEvent(m.rmLogsReverseCh)
m.chainSub = m.backend.SubscribeChainEvent(m.chainCh) m.chainSub = m.backend.SubscribeChainEvent(m.chainCh)
// Make sure none of the subscriptions are empty // Make sure none of the subscriptions are empty
if m.txsSub == nil || m.logsSub == nil || m.rmLogsSub == nil || m.rmLogsReverseSub == nil || m.chainSub == nil { if m.txsSub == nil || m.logsSub == nil || m.rmLogsSub == nil || m.chainSub == nil {
log.Crit("Subscribe for event system failed") log.Crit("Subscribe for event system failed")
} }
@ -407,7 +402,6 @@ func (es *EventSystem) eventLoop() {
es.txsSub.Unsubscribe() es.txsSub.Unsubscribe()
es.logsSub.Unsubscribe() es.logsSub.Unsubscribe()
es.rmLogsSub.Unsubscribe() es.rmLogsSub.Unsubscribe()
es.rmLogsReverseSub.Unsubscribe()
es.chainSub.Unsubscribe() es.chainSub.Unsubscribe()
}() }()
@ -424,8 +418,6 @@ func (es *EventSystem) eventLoop() {
es.handleLogs(index, ev) es.handleLogs(index, ev)
case ev := <-es.rmLogsCh: case ev := <-es.rmLogsCh:
es.handleLogs(index, ev.Logs) es.handleLogs(index, ev.Logs)
case ev := <-es.rmLogsReverseCh:
es.handleLogs(index, ev.Logs)
case ev := <-es.chainCh: case ev := <-es.chainCh:
es.handleChainEvent(index, ev) es.handleChainEvent(index, ev)
@ -444,8 +436,6 @@ func (es *EventSystem) eventLoop() {
return return
case <-es.rmLogsSub.Err(): case <-es.rmLogsSub.Err():
return return
case <-es.rmLogsReverseSub.Err():
return
case <-es.chainSub.Err(): case <-es.chainSub.Err():
return return
} }