eth/filters: reuse error msg for invalid block range (#28479)

ucwong · web-flow · commit e9f59b5d5ea4 · 2023-11-21T15:28:44.000+01:00
diff --git a/eth/filters/filter.go b/eth/filters/filter.go
@@ -114,7 +114,7 @@ func (f *Filter) Logs(ctx context.Context) ([]*types.Log, error) {
 
 	// special case for pending logs
 	if beginPending && !endPending {
-		return nil, errors.New("invalid block range")
+		return nil, errInvalidBlockRange
 	}
 
 	// Short-cut if all we care about is pending logs
diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go
@@ -353,7 +353,7 @@ func TestFilters(t *testing.T) {
 		},
 		{
 			f:   sys.NewRangeFilter(int64(rpc.PendingBlockNumber), int64(rpc.LatestBlockNumber), nil, nil),
-			err: "invalid block range",
+			err: errInvalidBlockRange.Error(),
 		},
 	} {
 		logs, err := tc.f.Logs(context.Background())

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ func (f Filter) Logs(ctx context.Context) ([]types.Log, error) {`
`114`	`114`
`115`	`115`	`// special case for pending logs`
`116`	`116`	`if beginPending && !endPending {`
`117`		`- return nil, errors.New("invalid block range")`
	`117`	`+ return nil, errInvalidBlockRange`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`// Short-cut if all we care about is pending logs`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ func TestFilters(t *testing.T) {`
`353`	`353`	`},`
`354`	`354`	`{`
`355`	`355`	`f: sys.NewRangeFilter(int64(rpc.PendingBlockNumber), int64(rpc.LatestBlockNumber), nil, nil),`
`356`		`- err: "invalid block range",`
	`356`	`+ err: errInvalidBlockRange.Error(),`
`357`	`357`	`},`
`358`	`358`	`} {`
`359`	`359`	`logs, err := tc.f.Logs(context.Background())`