diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index 9fc20f335b1a..af26a133a3ed 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -34,7 +34,6 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rpc" ) @@ -235,16 +234,17 @@ func NewEventSystem(sys *FilterSystem, lightMode bool) *EventSystem { } // Subscribe events - m.txsSub = m.backend.SubscribeNewTxsEvent(m.txsCh) + // m.txsSub = m.backend.SubscribeNewTxsEvent(m.txsCh) m.logsSub = m.backend.SubscribeLogsEvent(m.logsCh) m.rmLogsSub = m.backend.SubscribeRemovedLogsEvent(m.rmLogsCh) m.chainSub = m.backend.SubscribeChainEvent(m.chainCh) m.pendingLogsSub = m.backend.SubscribePendingLogsEvent(m.pendingLogsCh) - // Make sure none of the subscriptions are empty - if m.txsSub == nil || m.logsSub == nil || m.rmLogsSub == nil || m.chainSub == nil || m.pendingLogsSub == nil { - log.Crit("Subscribe for event system failed") - } + // TODO: enable this check once m.txsSub is implemented + // // Make sure none of the subscriptions are empty + // if m.txsSub == nil || m.logsSub == nil || m.rmLogsSub == nil || m.chainSub == nil || m.pendingLogsSub == nil { + // log.Crit("Subscribe for event system failed") + // } go m.eventLoop() return m @@ -452,11 +452,11 @@ func (es *EventSystem) handleRemovedLogs(filters filterIndex, ev core.RemovedLog } } -func (es *EventSystem) handleTxsEvent(filters filterIndex, ev core.NewTxsEvent) { - for _, f := range filters[PendingTransactionsSubscription] { - f.txs <- ev.Txs - } -} +// func (es *EventSystem) handleTxsEvent(filters filterIndex, ev core.NewTxsEvent) { +// for _, f := range filters[PendingTransactionsSubscription] { +// f.txs <- ev.Txs +// } +// } func (es *EventSystem) handleChainEvent(filters filterIndex, ev core.ChainEvent) { for _, f := range filters[BlocksSubscription] { @@ -553,7 +553,7 @@ func (es *EventSystem) lightFilterLogs(header *types.Header, addresses []common. func (es *EventSystem) eventLoop() { // Ensure all subscriptions get cleaned up defer func() { - es.txsSub.Unsubscribe() + // es.txsSub.Unsubscribe() es.logsSub.Unsubscribe() es.rmLogsSub.Unsubscribe() es.pendingLogsSub.Unsubscribe() @@ -567,8 +567,8 @@ func (es *EventSystem) eventLoop() { for { select { - case ev := <-es.txsCh: - es.handleTxsEvent(index, ev) + // case ev := <-es.txsCh: + // es.handleTxsEvent(index, ev) case ev := <-es.logsCh: es.handleLogs(index, ev) case ev := <-es.rmLogsCh: