From fe819f3b9f7a2d8d842c53b7269ccceace533569 Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Tue, 17 Mar 2015 09:11:01 -0400
Subject: [PATCH] Comment out whisper remove identity stubs

---
 rpc/api.go         | 20 ++++++++++----------
 whisper/whisper.go | 16 ++++++++--------
 xeth/whisper.go    |  6 +++---
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/rpc/api.go b/rpc/api.go
index b2d04cee6..079347192 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -371,10 +371,10 @@ func (p *EthereumApi) NewWhisperIdentity(reply *interface{}) error {
 	return nil
 }
 
-func (p *EthereumApi) RemoveWhisperIdentity(args *WhisperIdentityArgs, reply *interface{}) error {
-	*reply = p.xeth().Whisper().RemoveIdentity(args.Identity)
-	return nil
-}
+// func (p *EthereumApi) RemoveWhisperIdentity(args *WhisperIdentityArgs, reply *interface{}) error {
+// 	*reply = p.xeth().Whisper().RemoveIdentity(args.Identity)
+// 	return nil
+// }
 
 func (p *EthereumApi) NewWhisperFilter(args *WhisperFilterArgs, reply *interface{}) error {
 	var id int
@@ -756,12 +756,12 @@ func (p *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) error
 		return p.WhisperPost(args, reply)
 	case "shh_newIdentity":
 		return p.NewWhisperIdentity(reply)
-	case "shh_removeIdentity":
-		args := new(WhisperIdentityArgs)
-		if err := json.Unmarshal(req.Params, &args); err != nil {
-			return err
-		}
-		return p.RemoveWhisperIdentity(args, reply)
+	// case "shh_removeIdentity":
+	// 	args := new(WhisperIdentityArgs)
+	// 	if err := json.Unmarshal(req.Params, &args); err != nil {
+	// 		return err
+	// 	}
+	// 	return p.RemoveWhisperIdentity(args, reply)
 	case "shh_hasIdentity":
 		args := new(WhisperIdentityArgs)
 		if err := json.Unmarshal(req.Params, &args); err != nil {
diff --git a/whisper/whisper.go b/whisper/whisper.go
index c80ba3c8e..908df973c 100644
--- a/whisper/whisper.go
+++ b/whisper/whisper.go
@@ -116,14 +116,14 @@ func (self *Whisper) GetIdentity(key *ecdsa.PublicKey) *ecdsa.PrivateKey {
 	return self.keys[string(crypto.FromECDSAPub(key))]
 }
 
-func (self *Whisper) RemoveIdentity(key *ecdsa.PublicKey) bool {
-	k := string(crypto.FromECDSAPub(key))
-	if _, ok := self.keys[k]; ok {
-		delete(self.keys, k)
-		return true
-	}
-	return false
-}
+// func (self *Whisper) RemoveIdentity(key *ecdsa.PublicKey) bool {
+// 	k := string(crypto.FromECDSAPub(key))
+// 	if _, ok := self.keys[k]; ok {
+// 		delete(self.keys, k)
+// 		return true
+// 	}
+// 	return false
+// }
 
 func (self *Whisper) Watch(opts Filter) int {
 	return self.filters.Install(filter.Generic{
diff --git a/xeth/whisper.go b/xeth/whisper.go
index eb5fc789c..c0be4c392 100644
--- a/xeth/whisper.go
+++ b/xeth/whisper.go
@@ -63,9 +63,9 @@ func (self *Whisper) HasIdentity(key string) bool {
 	return self.Whisper.HasIdentity(crypto.ToECDSAPub(common.FromHex(key)))
 }
 
-func (self *Whisper) RemoveIdentity(key string) bool {
-	return self.Whisper.RemoveIdentity(crypto.ToECDSAPub(common.FromHex(key)))
-}
+// func (self *Whisper) RemoveIdentity(key string) bool {
+// 	return self.Whisper.RemoveIdentity(crypto.ToECDSAPub(common.FromHex(key)))
+// }
 
 func (self *Whisper) Watch(opts *Options) int {
 	filter := whisper.Filter{