From fedae9501582cb64c850def557b1fc3742d892dc Mon Sep 17 00:00:00 2001 From: Domino Valdano Date: Tue, 8 May 2018 05:39:15 -0700 Subject: [PATCH] eth/filters: derive FilterCriteria from ethereum.FilterQuery (#16629) --- eth/filters/api.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/eth/filters/api.go b/eth/filters/api.go index ec403709c5..1297b74788 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -268,14 +268,8 @@ func (api *PublicFilterAPI) Logs(ctx context.Context, crit FilterCriteria) (*rpc } // FilterCriteria represents a request to create a new filter. -// -// TODO(karalabe): Kill this in favor of ethereum.FilterQuery. -type FilterCriteria struct { - FromBlock *big.Int - ToBlock *big.Int - Addresses []common.Address - Topics [][]common.Hash -} +// Same as ethereum.FilterQuery but with UnmarshalJSON() method. +type FilterCriteria ethereum.FilterQuery // NewFilter creates a new filter and returns the filter id. It can be // used to retrieve logs when the state changes. This method cannot be