aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorgluk256 <gluk256@users.noreply.github.com>2017-04-28 17:57:15 +0800
committerFelix Lange <fjl@users.noreply.github.com>2017-04-28 17:57:15 +0800
commitf9be9a2302dd73fe3cc792167d65f24c7b7d35c4 (patch)
treef36a8c8a964f16e68b352dc0e750235aff043930 /cmd
parent95f0bd0acf301bf8415747c4ff050e8a4dfdc864 (diff)
downloaddexon-f9be9a2302dd73fe3cc792167d65f24c7b7d35c4.tar
dexon-f9be9a2302dd73fe3cc792167d65f24c7b7d35c4.tar.gz
dexon-f9be9a2302dd73fe3cc792167d65f24c7b7d35c4.tar.bz2
dexon-f9be9a2302dd73fe3cc792167d65f24c7b7d35c4.tar.lz
dexon-f9be9a2302dd73fe3cc792167d65f24c7b7d35c4.tar.xz
dexon-f9be9a2302dd73fe3cc792167d65f24c7b7d35c4.tar.zst
dexon-f9be9a2302dd73fe3cc792167d65f24c7b7d35c4.zip
whisper: switching to v5 + minor refactoring (#14387)
Diffstat (limited to 'cmd')
-rw-r--r--cmd/utils/flags.go2
-rw-r--r--cmd/wnode/main.go7
2 files changed, 5 insertions, 4 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index afaa7214b..e9b0d86a4 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -52,7 +52,7 @@ import (
"github.com/ethereum/go-ethereum/p2p/nat"
"github.com/ethereum/go-ethereum/p2p/netutil"
"github.com/ethereum/go-ethereum/params"
- whisper "github.com/ethereum/go-ethereum/whisper/whisperv2"
+ whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go
index f9b689b65..f18025dff 100644
--- a/cmd/wnode/main.go
+++ b/cmd/wnode/main.go
@@ -183,7 +183,7 @@ func initialize() {
if *testMode {
symPass = "wwww" // ascii code: 0x77777777
- msPassword = "mail server test password"
+ msPassword = "wwww"
}
if *bootstrapMode {
@@ -330,7 +330,7 @@ func configureNode() {
if !*asymmetricMode && !*forwarderMode {
if len(symPass) == 0 {
- symPass, err = console.Stdin.PromptPassword("Please enter the password: ")
+ symPass, err = console.Stdin.PromptPassword("Please enter the password for symmetric encryption: ")
if err != nil {
utils.Fatalf("Failed to read passphrase: %v", err)
}
@@ -347,6 +347,8 @@ func configureNode() {
if len(*argTopic) == 0 {
generateTopic([]byte(symPass))
}
+
+ fmt.Printf("Filter is configured for the topic: %x \n", topic)
}
if *mailServerMode {
@@ -365,7 +367,6 @@ func configureNode() {
if err != nil {
utils.Fatalf("Failed to install filter: %s", err)
}
- fmt.Printf("Filter is configured for the topic: %x \n", topic)
}
func generateTopic(password []byte) {