From 1f9b93647be5badfec854210b6c2b036d8c9aa6c Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Thu, 19 Mar 2015 23:11:52 -0400
Subject: inline NewWhisperFilter

---
 rpc/api.go | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'rpc')

diff --git a/rpc/api.go b/rpc/api.go
index ff2ae6c34..15a9f8b1f 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -175,16 +175,6 @@ func (p *EthereumApi) GetStorageAt(args *GetStorageAtArgs, reply *interface{}) e
 	return nil
 }
 
-func (p *EthereumApi) NewWhisperFilter(args *WhisperFilterArgs, reply *interface{}) error {
-	opts := new(xeth.Options)
-	opts.From = args.From
-	opts.To = args.To
-	opts.Topics = args.Topics
-	id := p.xeth().NewWhisperFilter(opts)
-	*reply = common.ToHex(big.NewInt(int64(id)).Bytes())
-	return nil
-}
-
 func (p *EthereumApi) UninstallWhisperFilter(id int, reply *interface{}) error {
 	*reply = p.xeth().UninstallWhisperFilter(id)
 	return nil
@@ -550,7 +540,12 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
 		if err := json.Unmarshal(req.Params, &args); err != nil {
 			return err
 		}
-		return p.NewWhisperFilter(args, reply)
+		opts := new(xeth.Options)
+		opts.From = args.From
+		opts.To = args.To
+		opts.Topics = args.Topics
+		id := p.xeth().NewWhisperFilter(opts)
+		*reply = common.ToHex(big.NewInt(int64(id)).Bytes())
 	case "shh_uninstallFilter":
 		args := new(FilterIdArgs)
 		if err := json.Unmarshal(req.Params, &args); err != nil {
-- 
cgit v1.2.3