From dba4f3122e83a66edc1fa089c5d69f789b07a6b3 Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Thu, 19 Feb 2015 13:21:37 +0100
Subject: Added uninstall filter methods

---
 rpc/message.go  | 15 +++++++++++++++
 rpc/packages.go | 13 +++++++++++++
 2 files changed, 28 insertions(+)

(limited to 'rpc')

diff --git a/rpc/message.go b/rpc/message.go
index b5b852f54..524d7fc84 100644
--- a/rpc/message.go
+++ b/rpc/message.go
@@ -231,6 +231,21 @@ func (req *RpcRequest) ToFilterStringArgs() (string, error) {
 	return args, nil
 }
 
+func (req *RpcRequest) ToUninstallFilterArgs() (int, error) {
+	if len(req.Params) < 1 {
+		return 0, NewErrorResponse(ErrorArguments)
+	}
+
+	var args int
+	err := json.Unmarshal(req.Params[0], &args)
+	if err != nil {
+		return 0, NewErrorResponse(ErrorDecodeArgs)
+	}
+
+	rpclogger.DebugDetailf("%T %v", args, args)
+	return args, nil
+}
+
 func (req *RpcRequest) ToFilterChangedArgs() (int, error) {
 	if len(req.Params) < 1 {
 		return 0, NewErrorResponse(ErrorArguments)
diff --git a/rpc/packages.go b/rpc/packages.go
index 8aa604aa5..216321dba 100644
--- a/rpc/packages.go
+++ b/rpc/packages.go
@@ -105,6 +105,13 @@ func (self *EthereumApi) NewFilter(args *FilterOptions, reply *interface{}) erro
 	return nil
 }
 
+func (self *EthereumApi) UninstallFilter(id int, reply *interface{}) error {
+	delete(self.logs, id)
+	self.filterManager.UninstallFilter(id)
+	*reply = true
+	return nil
+}
+
 func (self *EthereumApi) NewFilterString(args string, reply *interface{}) error {
 	var id int
 	filter := core.NewFilter(self.xeth.Backend())
@@ -444,6 +451,12 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
 			return err
 		}
 		return p.NewFilterString(args, reply)
+	case "eth_uninstallFilter":
+		args, err := req.ToUninstallFilterArgs()
+		if err != nil {
+			return err
+		}
+		return p.UninstallFilter(args, reply)
 	case "eth_changed":
 		args, err := req.ToFilterChangedArgs()
 		if err != nil {
-- 
cgit v1.2.3