forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 18:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

whisper: update code to address Vlad's command

Browse source
This commit is contained in:
Guillaume Ballet 2018-04-16 17:35:53 +02:00
parent 95d4f6f833
commit 2205d77508
1 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmd/wnode/main.go
View file

@ -201,8 +201,7 @@ func initialize() {
if len(*argIP) == 0 { if len(*argIP) == 0 {
argIP = scanLineA("Please enter your IP and port (e.g. 127.0.0.1:30348): ") argIP = scanLineA("Please enter your IP and port (e.g. 127.0.0.1:30348): ")
} }
} else { } else if *argPort == 0 {
if *argPort == 0 {
for { for {
fmt.Print("Please enter the port to use: ") fmt.Print("Please enter the port to use: ")
if _, err := fmt.Scanf("%d", argPort); err != nil || *argPort >= 1024 { if _, err := fmt.Scanf("%d", argPort); err != nil || *argPort >= 1024 {
@ -210,9 +209,7 @@ func initialize() {
} }
} }
} }
} } else if *useLibP2P {
} else {
if *useLibP2P {
var libp2pbootstrap *string var libp2pbootstrap *string
for libp2pbootstrap == nil { for libp2pbootstrap == nil {
libp2pbootstrap = scanLineA("Please enter the bootstrap node's address: ") libp2pbootstrap = scanLineA("Please enter the bootstrap node's address: ")
@ -230,7 +227,6 @@ func initialize() {
peer := discover.MustParseNode(*argEnode) peer := discover.MustParseNode(*argEnode)
peers = append(peers, peer) peers = append(peers, peer)
} }
}
if *mailServerMode { if *mailServerMode {
if len(msPassword) == 0 { if len(msPassword) == 0 {