From ef87c330ceb25c772997a1cd6a07eb281c25345d Mon Sep 17 00:00:00 2001 From: Pedro Pombeiro Date: Tue, 17 Dec 2019 21:54:46 +0100 Subject: [PATCH] Improve parameter naming in `Whisper.DeleteKeyPair` --- eth-node/bridge/geth/whisper.go | 6 +++--- eth-node/bridge/nimbus/whisper.go | 6 +++--- eth-node/types/whisper.go | 4 ++-- .../status-im/status-go/eth-node/bridge/geth/whisper.go | 6 +++--- .../status-im/status-go/eth-node/types/whisper.go | 4 ++-- vendor/github.com/status-im/status-go/whisper/v6/whisper.go | 2 +- whisper/whisper.go | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eth-node/bridge/geth/whisper.go b/eth-node/bridge/geth/whisper.go index a85d98eda..c4d73bc1c 100644 --- a/eth-node/bridge/geth/whisper.go +++ b/eth-node/bridge/geth/whisper.go @@ -85,9 +85,9 @@ func (w *gethWhisperWrapper) AddKeyPair(key *ecdsa.PrivateKey) (string, error) { return w.whisper.AddKeyPair(key) } -// DeleteKeyPair deletes the specified key if it exists. -func (w *gethWhisperWrapper) DeleteKeyPair(key string) bool { - return w.whisper.DeleteKeyPair(key) +// DeleteKeyPair deletes the key with the specified ID if it exists. +func (w *gethWhisperWrapper) DeleteKeyPair(keyID string) bool { + return w.whisper.DeleteKeyPair(keyID) } func (w *gethWhisperWrapper) AddSymKeyDirect(key []byte) (string, error) { diff --git a/eth-node/bridge/nimbus/whisper.go b/eth-node/bridge/nimbus/whisper.go index cea95b469..8bb4be764 100644 --- a/eth-node/bridge/nimbus/whisper.go +++ b/eth-node/bridge/nimbus/whisper.go @@ -164,10 +164,10 @@ func (w *nimbusWhisperWrapper) AddKeyPair(key *ecdsa.PrivateKey) (string, error) return retVal.(string), nil } -// DeleteKeyPair deletes the specified key if it exists. -func (w *nimbusWhisperWrapper) DeleteKeyPair(key string) bool { +// DeleteKeyPair deletes the key with the specified ID if it exists. +func (w *nimbusWhisperWrapper) DeleteKeyPair(keyID string) bool { return w.routineQueue.Send(func(c chan<- interface{}) { - keyC, err := decodeHexID(key) + keyC, err := decodeHexID(keyID) if err != nil { c <- err return diff --git a/eth-node/types/whisper.go b/eth-node/types/whisper.go index 22a6928c1..17fc26480 100644 --- a/eth-node/types/whisper.go +++ b/eth-node/types/whisper.go @@ -51,8 +51,8 @@ type Whisper interface { // AddKeyPair imports a asymmetric private key and returns a deterministic identifier. AddKeyPair(key *ecdsa.PrivateKey) (string, error) - // DeleteKeyPair deletes the specified key if it exists. - DeleteKeyPair(key string) bool + // DeleteKeyPair deletes the key with the specified ID if it exists. + DeleteKeyPair(keyID string) bool AddSymKeyDirect(key []byte) (string, error) AddSymKeyFromPassword(password string) (string, error) DeleteSymKey(id string) bool diff --git a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/whisper.go b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/whisper.go index a85d98eda..c4d73bc1c 100644 --- a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/whisper.go +++ b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/whisper.go @@ -85,9 +85,9 @@ func (w *gethWhisperWrapper) AddKeyPair(key *ecdsa.PrivateKey) (string, error) { return w.whisper.AddKeyPair(key) } -// DeleteKeyPair deletes the specified key if it exists. -func (w *gethWhisperWrapper) DeleteKeyPair(key string) bool { - return w.whisper.DeleteKeyPair(key) +// DeleteKeyPair deletes the key with the specified ID if it exists. +func (w *gethWhisperWrapper) DeleteKeyPair(keyID string) bool { + return w.whisper.DeleteKeyPair(keyID) } func (w *gethWhisperWrapper) AddSymKeyDirect(key []byte) (string, error) { diff --git a/vendor/github.com/status-im/status-go/eth-node/types/whisper.go b/vendor/github.com/status-im/status-go/eth-node/types/whisper.go index 22a6928c1..17fc26480 100644 --- a/vendor/github.com/status-im/status-go/eth-node/types/whisper.go +++ b/vendor/github.com/status-im/status-go/eth-node/types/whisper.go @@ -51,8 +51,8 @@ type Whisper interface { // AddKeyPair imports a asymmetric private key and returns a deterministic identifier. AddKeyPair(key *ecdsa.PrivateKey) (string, error) - // DeleteKeyPair deletes the specified key if it exists. - DeleteKeyPair(key string) bool + // DeleteKeyPair deletes the key with the specified ID if it exists. + DeleteKeyPair(keyID string) bool AddSymKeyDirect(key []byte) (string, error) AddSymKeyFromPassword(password string) (string, error) DeleteSymKey(id string) bool diff --git a/vendor/github.com/status-im/status-go/whisper/v6/whisper.go b/vendor/github.com/status-im/status-go/whisper/v6/whisper.go index 5ed5bdef1..348c03c58 100644 --- a/vendor/github.com/status-im/status-go/whisper/v6/whisper.go +++ b/vendor/github.com/status-im/status-go/whisper/v6/whisper.go @@ -597,7 +597,7 @@ func (whisper *Whisper) NewKeyPair() (string, error) { 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 { deterministicID, err := toDeterministicID(key, keyIDSize) if err != nil { diff --git a/whisper/whisper.go b/whisper/whisper.go index 5ed5bdef1..348c03c58 100644 --- a/whisper/whisper.go +++ b/whisper/whisper.go @@ -597,7 +597,7 @@ func (whisper *Whisper) NewKeyPair() (string, error) { 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 { deterministicID, err := toDeterministicID(key, keyIDSize) if err != nil {