diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 990cee9d77..017dceda06 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -346,7 +346,7 @@ func (b *SimulatedBackend) FilterLogs(ctx context.Context, query ethereum.Filter var filter *filters.Filter if query.BlockHash != nil { // Block filter requested, construct a single-shot filter - filter = filters.NewBlockFilter(&filterBackend{b.database, b.blockchain}, *query.BlockHash, query.Addresses, query.Topics) + filter = filters.NewBlockFilter(&filterBackend{b.database, b.blockchain, nil}, *query.BlockHash, query.Addresses, query.Topics) } else { // Initialize unset filter boundaried to run from genesis to chain head from := int64(0) diff --git a/eth/api_backend.go b/eth/api_backend.go index 7935f5ffe1..2acc309941 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -225,6 +225,6 @@ func (b *EthAPIBackend) ServiceFilter(ctx context.Context, session *bloombits.Ma } } -func (b *EthApiBackend) FilterTaskChannel() chan *filters.BlockFilterTask { +func (b *EthAPIBackend) FilterTaskChannel() chan *filters.BlockFilterTask { return b.eth.filterTasks } diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 33471bff3a..d250e45bbe 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -316,7 +316,6 @@ func (f *Filter) unindexedLogs(ctx context.Context, tasks chan *BlockFilterTask, case <-ctx.Done(): return ctx.Err() } - logs = append(logs, found...) } return nil } diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index f9652ee2c3..60df14a4dc 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -368,7 +368,7 @@ func TestInvalidGetLogsRequest(t *testing.T) { rmLogsFeed = new(event.Feed) logsFeed = new(event.Feed) chainFeed = new(event.Feed) - backend = &testBackend{mux, db, 0, txFeed, rmLogsFeed, logsFeed, chainFeed} + backend = &testBackend{mux, db, 0, txFeed, rmLogsFeed, logsFeed, chainFeed, nil} api = NewPublicFilterAPI(backend, false) blockHash = common.HexToHash("0x1111111111111111111111111111111111111111111111111111111111111111") )