From aac7d4e5242b23a7b914d0cfde93118118010bdc Mon Sep 17 00:00:00 2001 From: jsvisa Date: Tue, 24 Oct 2023 22:07:53 +0800 Subject: [PATCH] Revert "eth/filter: check begin/end inside rangeFilter" This reverts commit ed3b1e61cf48de91fb52cf403c400b6991b8a182. Signed-off-by: jsvisa --- eth/filters/api.go | 8 ++------ eth/filters/filter.go | 9 ++------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/eth/filters/api.go b/eth/filters/api.go index 02945cad03..3047d22646 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -349,11 +349,7 @@ func (api *FilterAPI) GetLogs(ctx context.Context, crit FilterCriteria) ([]*type end = crit.ToBlock.Int64() } // Construct the range filter - var err error - filter, err = api.sys.NewRangeFilter(begin, end, crit.Addresses, crit.Topics) - if err != nil { - return nil, err - } + filter = api.sys.NewRangeFilter(begin, end, crit.Addresses, crit.Topics) } // Run the filter and return all the logs logs, err := filter.Logs(ctx) @@ -404,7 +400,7 @@ func (api *FilterAPI) GetFilterLogs(ctx context.Context, id rpc.ID) ([]*types.Lo end = f.crit.ToBlock.Int64() } // Construct the range filter - filter, _ = api.sys.NewRangeFilter(begin, end, f.crit.Addresses, f.crit.Topics) + filter = api.sys.NewRangeFilter(begin, end, f.crit.Addresses, f.crit.Topics) } // Run the filter and return all the logs logs, err := filter.Logs(ctx) diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 8e4d610557..a5750c1934 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -42,12 +42,7 @@ type Filter struct { // NewRangeFilter creates a new filter which uses a bloom filter on blocks to // figure out whether a particular block is interesting or not. -func (sys *FilterSystem) NewRangeFilter(begin, end int64, addresses []common.Address, topics [][]common.Hash) (*Filter, error) { - // Fast exit if from > to - if begin > 0 && end > 0 && begin > end { - return nil, errInvalidBlockRange - } - +func (sys *FilterSystem) NewRangeFilter(begin, end int64, addresses []common.Address, topics [][]common.Hash) *Filter { // Flatten the address and topic filter clauses into a single bloombits filter // system. Since the bloombits are not positional, nil topics are permitted, // which get flattened into a nil byte slice. @@ -75,7 +70,7 @@ func (sys *FilterSystem) NewRangeFilter(begin, end int64, addresses []common.Add filter.begin = begin filter.end = end - return filter, nil + return filter } // NewBlockFilter creates a new filter which directly inspects the contents of