From 78e03595aff47b5c608896b3d07dca84ec3b6638 Mon Sep 17 00:00:00 2001 From: Eugene Valeyev Date: Mon, 18 Jun 2018 16:59:51 +0300 Subject: [PATCH] mobile: switched whisper version to v6 --- mobile/shhclient.go | 5 ++--- mobile/types.go | 2 +- vendor/gopkg.in/check.v1/benchmark.go | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mobile/shhclient.go b/mobile/shhclient.go index 4834bb2ba8..a069c9bd40 100644 --- a/mobile/shhclient.go +++ b/mobile/shhclient.go @@ -20,7 +20,7 @@ package geth import ( "github.com/ethereum/go-ethereum/whisper/shhclient" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" ) // WhisperClient provides access to the Ethereum APIs. @@ -53,7 +53,6 @@ func (wc *WhisperClient) SetMaxMessageSize(ctx *Context, size int32) error { } // SetMinimumPoW (experimental) sets the minimal PoW required by this node. - // This experimental function was introduced for the future dynamic adjustment of // PoW requirement. If the node is overwhelmed with messages, it should raise the // PoW requirement and notify the peers. The new value should be set relative to @@ -132,7 +131,7 @@ func (wc *WhisperClient) DeleteSymmetricKey(ctx *Context, id string) error { } // Post a message onto the network. -func (wc *WhisperClient) Post(ctx *Context, message *NewMessage) error { +func (wc *WhisperClient) Post(ctx *Context, message *NewMessage) (string, error) { return wc.client.Post(ctx.context, *message.newMessage) } diff --git a/mobile/types.go b/mobile/types.go index ee009d9f6c..d1ff56e76a 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -26,7 +26,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rlp" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" ) // A Nonce is a 64-bit hash which proves (combined with the mix-hash) that diff --git a/vendor/gopkg.in/check.v1/benchmark.go b/vendor/gopkg.in/check.v1/benchmark.go index c27f1251a6..46ea9dc6da 100644 --- a/vendor/gopkg.in/check.v1/benchmark.go +++ b/vendor/gopkg.in/check.v1/benchmark.go @@ -3,7 +3,7 @@ // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are // met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above @@ -13,7 +13,7 @@ // * Neither the name of Google Inc. nor the names of its // contributors may be used to endorse or promote products derived from // this software without specific prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR