status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve parameter naming in `Whisper.DeleteKeyPair`

This commit is contained in:
Pedro Pombeiro 2019-12-17 21:54:46 +01:00 committed by Pedro Pombeiro
parent 0cf24d2c3e
commit ef87c330ce
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eth-node/bridge/geth/whisper.go
View File

@ -85,9 +85,9 @@ func (w *gethWhisperWrapper) AddKeyPair(key *ecdsa.PrivateKey) (string, error) {
return w.whisper.AddKeyPair(key) return w.whisper.AddKeyPair(key)
} }
// DeleteKeyPair deletes the specified key if it exists. // DeleteKeyPair deletes the key with the specified ID if it exists.
func (w *gethWhisperWrapper) DeleteKeyPair(key string) bool { func (w *gethWhisperWrapper) DeleteKeyPair(keyID string) bool {
return w.whisper.DeleteKeyPair(key) return w.whisper.DeleteKeyPair(keyID)
} }
func (w *gethWhisperWrapper) AddSymKeyDirect(key []byte) (string, error) { func (w *gethWhisperWrapper) AddSymKeyDirect(key []byte) (string, error) {

6
eth-node/bridge/nimbus/whisper.go
View File

@ -164,10 +164,10 @@ func (w *nimbusWhisperWrapper) AddKeyPair(key *ecdsa.PrivateKey) (string, error)
return retVal.(string), nil return retVal.(string), nil
} }
// DeleteKeyPair deletes the specified key if it exists. // DeleteKeyPair deletes the key with the specified ID if it exists.
func (w *nimbusWhisperWrapper) DeleteKeyPair(key string) bool { func (w *nimbusWhisperWrapper) DeleteKeyPair(keyID string) bool {
return w.routineQueue.Send(func(c chan<- interface{}) { return w.routineQueue.Send(func(c chan<- interface{}) {
keyC, err := decodeHexID(key) keyC, err := decodeHexID(keyID)
if err != nil { if err != nil {
c <- err c <- err
return return

4
eth-node/types/whisper.go
View File

@ -51,8 +51,8 @@ type Whisper interface {
// AddKeyPair imports a asymmetric private key and returns a deterministic identifier. // AddKeyPair imports a asymmetric private key and returns a deterministic identifier.
AddKeyPair(key *ecdsa.PrivateKey) (string, error) AddKeyPair(key *ecdsa.PrivateKey) (string, error)
// DeleteKeyPair deletes the specified key if it exists. // DeleteKeyPair deletes the key with the specified ID if it exists.
DeleteKeyPair(key string) bool DeleteKeyPair(keyID string) bool
AddSymKeyDirect(key []byte) (string, error) AddSymKeyDirect(key []byte) (string, error)
AddSymKeyFromPassword(password string) (string, error) AddSymKeyFromPassword(password string) (string, error)
DeleteSymKey(id string) bool DeleteSymKey(id string) bool

6
vendor/github.com/status-im/status-go/eth-node/bridge/geth/whisper.go generated vendored
View File

@ -85,9 +85,9 @@ func (w *gethWhisperWrapper) AddKeyPair(key *ecdsa.PrivateKey) (string, error) {
return w.whisper.AddKeyPair(key) return w.whisper.AddKeyPair(key)
} }
// DeleteKeyPair deletes the specified key if it exists. // DeleteKeyPair deletes the key with the specified ID if it exists.
func (w *gethWhisperWrapper) DeleteKeyPair(key string) bool { func (w *gethWhisperWrapper) DeleteKeyPair(keyID string) bool {
return w.whisper.DeleteKeyPair(key) return w.whisper.DeleteKeyPair(keyID)
} }
func (w *gethWhisperWrapper) AddSymKeyDirect(key []byte) (string, error) { func (w *gethWhisperWrapper) AddSymKeyDirect(key []byte) (string, error) {

4
vendor/github.com/status-im/status-go/eth-node/types/whisper.go generated vendored
View File

@ -51,8 +51,8 @@ type Whisper interface {
// AddKeyPair imports a asymmetric private key and returns a deterministic identifier. // AddKeyPair imports a asymmetric private key and returns a deterministic identifier.
AddKeyPair(key *ecdsa.PrivateKey) (string, error) AddKeyPair(key *ecdsa.PrivateKey) (string, error)
// DeleteKeyPair deletes the specified key if it exists. // DeleteKeyPair deletes the key with the specified ID if it exists.
DeleteKeyPair(key string) bool DeleteKeyPair(keyID string) bool
AddSymKeyDirect(key []byte) (string, error) AddSymKeyDirect(key []byte) (string, error)
AddSymKeyFromPassword(password string) (string, error) AddSymKeyFromPassword(password string) (string, error)
DeleteSymKey(id string) bool DeleteSymKey(id string) bool

2
vendor/github.com/status-im/status-go/whisper/v6/whisper.go generated vendored
View File

@ -597,7 +597,7 @@ func (whisper *Whisper) NewKeyPair() (string, error) {
return id, nil return id, nil
} }
// DeleteKeyPair deletes the specified key if it exists. // DeleteKeyPair deletes the key with the specified ID if it exists.
func (whisper *Whisper) DeleteKeyPair(key string) bool { func (whisper *Whisper) DeleteKeyPair(key string) bool {
deterministicID, err := toDeterministicID(key, keyIDSize) deterministicID, err := toDeterministicID(key, keyIDSize)
if err != nil { if err != nil {

2
whisper/whisper.go
View File

@ -597,7 +597,7 @@ func (whisper *Whisper) NewKeyPair() (string, error) {
return id, nil return id, nil
} }
// DeleteKeyPair deletes the specified key if it exists. // DeleteKeyPair deletes the key with the specified ID if it exists.
func (whisper *Whisper) DeleteKeyPair(key string) bool { func (whisper *Whisper) DeleteKeyPair(key string) bool {
deterministicID, err := toDeterministicID(key, keyIDSize) deterministicID, err := toDeterministicID(key, keyIDSize)
if err != nil { if err != nil {