From 257c935e827c9cdd341394731ff10fec9f2cadf8 Mon Sep 17 00:00:00 2001
From: jsvisa <delweng@gmail.com>
Date: Fri, 20 Oct 2023 20:34:39 +0800
Subject: [PATCH] inner error

Signed-off-by: jsvisa <delweng@gmail.com>
---
 eth/filters/api.go           | 11 +++--------
 eth/filters/filter.go        |  2 +-
 eth/filters/filter_system.go |  2 +-
 graphql/graphql.go           |  3 ---
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/eth/filters/api.go b/eth/filters/api.go
index e9fdc1f19d..02945cad03 100644
--- a/eth/filters/api.go
+++ b/eth/filters/api.go
@@ -34,10 +34,9 @@ import (
 )
 
 var (
-	ErrInvalidBlockRange = errors.New("invalid from and to block combination: from > to")
-
-	errInvalidTopic   = errors.New("invalid topic(s)")
-	errFilterNotFound = errors.New("filter not found")
+	errInvalidTopic      = errors.New("invalid topic(s)")
+	errFilterNotFound    = errors.New("filter not found")
+	errInvalidBlockRange = errors.New("invalid from and to block combination: from > to")
 )
 
 // filter is a helper struct that holds meta information over the filter type
@@ -353,10 +352,6 @@ func (api *FilterAPI) GetLogs(ctx context.Context, crit FilterCriteria) ([]*type
 		var err error
 		filter, err = api.sys.NewRangeFilter(begin, end, crit.Addresses, crit.Topics)
 		if err != nil {
-			// Compatible with old implement
-			if err == ErrInvalidBlockRange {
-				return nil, nil
-			}
 			return nil, err
 		}
 	}
diff --git a/eth/filters/filter.go b/eth/filters/filter.go
index 36cbfb7165..8e4d610557 100644
--- a/eth/filters/filter.go
+++ b/eth/filters/filter.go
@@ -45,7 +45,7 @@ type Filter struct {
 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
+		return nil, errInvalidBlockRange
 	}
 
 	// Flatten the address and topic filter clauses into a single bloombits filter
diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go
index 300c1b8655..a9b5f2e079 100644
--- a/eth/filters/filter_system.go
+++ b/eth/filters/filter_system.go
@@ -331,7 +331,7 @@ func (es *EventSystem) SubscribeLogs(crit ethereum.FilterQuery, logs chan []*typ
 	if from >= 0 && to == rpc.LatestBlockNumber {
 		return es.subscribeLogs(crit, logs), nil
 	}
-	return nil, ErrInvalidBlockRange
+	return nil, errInvalidBlockRange
 }
 
 // subscribeMinedPendingLogs creates a subscription that returned mined and
diff --git a/graphql/graphql.go b/graphql/graphql.go
index b62a2124de..7cff224074 100644
--- a/graphql/graphql.go
+++ b/graphql/graphql.go
@@ -1428,9 +1428,6 @@ func (r *Resolver) Logs(ctx context.Context, args struct{ Filter FilterCriteria
 	// Construct the range filter
 	filter, err := r.filterSystem.NewRangeFilter(begin, end, addresses, topics)
 	if err != nil {
-		if err == filters.ErrInvalidBlockRange {
-			return nil, nil
-		}
 		return nil, err
 	}
 	return runFilter(ctx, r, filter)