diff --git a/mobile/shhclient.go b/mobile/shhclient.go index cada62e581..573aa47554 100644 --- a/mobile/shhclient.go +++ b/mobile/shhclient.go @@ -119,9 +119,9 @@ func (wc *WhisperClient) AddSymmetricKey(ctx *Context, key []byte) (string, erro } // GenerateSymmetricKeyFromPassword generates the key from password, stores it, and returns its identifier. -func (wc *WhisperClient) GenerateSymmetricKeyFromPassword(ctx *Context, passwd []byte) (string, error) { - rawVersion, err := wc.client.Version(ctx.context) - return string(rawVersion), err +func (wc *WhisperClient) GenerateSymmetricKeyFromPassword(ctx *Context, passwd string) (string, error) { + rawSymKeyID, err := wc.client.GenerateSymmetricKeyFromPassword(ctx.context, passwd) + return string(rawSymKeyID), err } // HasSymmetricKey returns an indication if the key associated with the given id is stored in the node. @@ -198,9 +198,9 @@ func (wc *WhisperClient) GetFilterMessages(ctx *Context, id string) (*Messages, if err != nil { return nil, err } - res := make([]*Message, len(rawFilterMessages)) + res := make([]*whisper.Message, len(rawFilterMessages)) for i := range rawFilterMessages { - res[i] = &Message{rawFilterMessages[i]} + res[i] = rawFilterMessages[i] } return &Messages{res}, nil } diff --git a/mobile/types.go b/mobile/types.go index 83ac5b8e4e..80403f3d89 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -377,9 +377,9 @@ type Message struct { message *whisper.Message } -// Messagea represents an array of messages. +// Messages represents an array of messages. type Messages struct { - messages []*Message + messages []*whisper.Message } // Criteria holds various filter options for inbound messages. diff --git a/whisper/shhclient/client.go b/whisper/shhclient/client.go index 61b4775d95..aa96e6491a 100644 --- a/whisper/shhclient/client.go +++ b/whisper/shhclient/client.go @@ -136,9 +136,9 @@ func (sc *Client) AddSymmetricKey(ctx context.Context, key []byte) (string, erro } // GenerateSymmetricKeyFromPassword generates the key from password, stores it, and returns its identifier. -func (sc *Client) GenerateSymmetricKeyFromPassword(ctx context.Context, passwd []byte) (string, error) { +func (sc *Client) GenerateSymmetricKeyFromPassword(ctx context.Context, passwd string) (string, error) { var id string - return id, sc.c.CallContext(ctx, &id, "shh_generateSymKeyFromPassword", hexutil.Bytes(passwd)) + return id, sc.c.CallContext(ctx, &id, "shh_generateSymKeyFromPassword", passwd) } // HasSymmetricKey returns an indication if the key associated with the given id is stored in the node.