Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
fe819f3b
Commit
fe819f3b
authored
Mar 17, 2015
by
Taylor Gerring
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Comment out whisper remove identity stubs
parent
176115e2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
21 deletions
+21
-21
api.go
rpc/api.go
+10
-10
whisper.go
whisper/whisper.go
+8
-8
whisper.go
xeth/whisper.go
+3
-3
No files found.
rpc/api.go
View file @
fe819f3b
...
...
@@ -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
{
...
...
whisper/whisper.go
View file @
fe819f3b
...
...
@@ -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
{
...
...
xeth/whisper.go
View file @
fe819f3b
...
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment