forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

eth/filters: rebase fix

Browse source
This commit is contained in:
Zsolt Felfoldi 2019-02-20 00:53:24 +01:00
parent d68757ae3b
commit cea09f3eec
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
accounts/abi/bind/backends/simulated.go
View file

@ -346,7 +346,7 @@ func (b *SimulatedBackend) FilterLogs(ctx context.Context, query ethereum.Filter
var filter *filters.Filter var filter *filters.Filter
if query.BlockHash != nil { if query.BlockHash != nil {
// Block filter requested, construct a single-shot filter // 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 { } else {
// Initialize unset filter boundaried to run from genesis to chain head // Initialize unset filter boundaried to run from genesis to chain head
from := int64(0) from := int64(0)

2
eth/api_backend.go
View file

@ -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 return b.eth.filterTasks
} }

1
eth/filters/filter.go
View file

@ -316,7 +316,6 @@ func (f *Filter) unindexedLogs(ctx context.Context, tasks chan *BlockFilterTask,
case <-ctx.Done(): case <-ctx.Done():
return ctx.Err() return ctx.Err()
} }
logs = append(logs, found...)
} }
return nil return nil
} }

2
eth/filters/filter_system_test.go
View file

@ -368,7 +368,7 @@ func TestInvalidGetLogsRequest(t *testing.T) {
rmLogsFeed = new(event.Feed) rmLogsFeed = new(event.Feed)
logsFeed = new(event.Feed) logsFeed = new(event.Feed)
chainFeed = 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) api = NewPublicFilterAPI(backend, false)
blockHash = common.HexToHash("0x1111111111111111111111111111111111111111111111111111111111111111") blockHash = common.HexToHash("0x1111111111111111111111111111111111111111111111111111111111111111")
) )