From 4663a55f123c3d4886a0537243d1ad86d2a51f21 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Thu, 19 Mar 2015 23:03:53 -0400 Subject: inline NewFilter --- rpc/api.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/rpc/api.go b/rpc/api.go index 9a994ebbd..495771a59 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -98,14 +98,6 @@ func (self *EthereumApi) getStateWithNum(num int64) *xeth.State { // return nil // } -func (self *EthereumApi) NewFilter(args *FilterOptions, reply *interface{}) error { - opts := toFilterOptions(args) - id := self.xeth().RegisterFilter(opts) - *reply = common.ToHex(big.NewInt(int64(id)).Bytes()) - - return nil -} - func (self *EthereumApi) UninstallFilter(id int, reply *interface{}) error { *reply = self.xeth().UninstallFilter(id) @@ -491,7 +483,10 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error if err := json.Unmarshal(req.Params, &args); err != nil { return err } - return p.NewFilter(args, reply) + + opts := toFilterOptions(args) + id := p.xeth().RegisterFilter(opts) + *reply = common.ToHex(big.NewInt(int64(id)).Bytes()) case "eth_newBlockFilter": args := new(FilterStringArgs) if err := json.Unmarshal(req.Params, &args); err != nil { -- cgit v1.2.3