From a3a2c6b0d9f963c9377612cae1ed6ded6f216c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Thu, 23 Nov 2017 14:22:59 +0200
Subject: cmd/puppeth: fix typos and review suggestions
---
cmd/puppeth/module_dashboard.go | 2 +-
cmd/puppeth/module_ethstats.go | 2 +-
cmd/puppeth/module_explorer.go | 2 +-
cmd/puppeth/module_faucet.go | 2 +-
cmd/puppeth/module_nginx.go | 2 +-
cmd/puppeth/module_node.go | 2 +-
cmd/puppeth/module_wallet.go | 2 +-
cmd/puppeth/wizard_dashboard.go | 5 ++---
cmd/puppeth/wizard_ethstats.go | 5 ++---
cmd/puppeth/wizard_explorer.go | 5 ++---
cmd/puppeth/wizard_faucet.go | 5 ++---
cmd/puppeth/wizard_node.go | 5 ++---
cmd/puppeth/wizard_wallet.go | 5 ++---
13 files changed, 19 insertions(+), 25 deletions(-)
(limited to 'cmd')
diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go
index 4fdb03e78..b6d964696 100644
--- a/cmd/puppeth/module_dashboard.go
+++ b/cmd/puppeth/module_dashboard.go
@@ -696,7 +696,7 @@ type dashboardInfos struct {
faucet string
}
-// Report converts the typed struct into a plain string->string map, cotnaining
+// Report converts the typed struct into a plain string->string map, containing
// most - but not all - fields for reporting to the user.
func (info *dashboardInfos) Report() map[string]string {
return map[string]string{
diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go
index cf9e66bc1..20b7afe23 100644
--- a/cmd/puppeth/module_ethstats.go
+++ b/cmd/puppeth/module_ethstats.go
@@ -115,7 +115,7 @@ type ethstatsInfos struct {
banned []string
}
-// Report converts the typed struct into a plain string->string map, cotnaining
+// Report converts the typed struct into a plain string->string map, containing
// most - but not all - fields for reporting to the user.
func (info *ethstatsInfos) Report() map[string]string {
return map[string]string{
diff --git a/cmd/puppeth/module_explorer.go b/cmd/puppeth/module_explorer.go
index 99a9e9df8..427134153 100644
--- a/cmd/puppeth/module_explorer.go
+++ b/cmd/puppeth/module_explorer.go
@@ -155,7 +155,7 @@ type explorerInfos struct {
webPort int
}
-// Report converts the typed struct into a plain string->string map, cotnaining
+// Report converts the typed struct into a plain string->string map, containing
// most - but not all - fields for reporting to the user.
func (info *explorerInfos) Report() map[string]string {
report := map[string]string{
diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go
index 615aea34a..57b7a2dc0 100644
--- a/cmd/puppeth/module_faucet.go
+++ b/cmd/puppeth/module_faucet.go
@@ -150,7 +150,7 @@ type faucetInfos struct {
captchaSecret string
}
-// Report converts the typed struct into a plain string->string map, cotnaining
+// Report converts the typed struct into a plain string->string map, containing
// most - but not all - fields for reporting to the user.
func (info *faucetInfos) Report() map[string]string {
report := map[string]string{
diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go
index ade0e4963..35c0efc8a 100644
--- a/cmd/puppeth/module_nginx.go
+++ b/cmd/puppeth/module_nginx.go
@@ -92,7 +92,7 @@ type nginxInfos struct {
port int
}
-// Report converts the typed struct into a plain string->string map, cotnaining
+// Report converts the typed struct into a plain string->string map, containing
// most - but not all - fields for reporting to the user.
func (info *nginxInfos) Report() map[string]string {
return map[string]string{
diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go
index 9b8d5f0f7..69cb19c34 100644
--- a/cmd/puppeth/module_node.go
+++ b/cmd/puppeth/module_node.go
@@ -170,7 +170,7 @@ type nodeInfos struct {
gasPrice float64
}
-// Report converts the typed struct into a plain string->string map, cotnaining
+// Report converts the typed struct into a plain string->string map, containing
// most - but not all - fields for reporting to the user.
func (info *nodeInfos) Report() map[string]string {
report := map[string]string{
diff --git a/cmd/puppeth/module_wallet.go b/cmd/puppeth/module_wallet.go
index 5ab8d2de1..67f47c70e 100644
--- a/cmd/puppeth/module_wallet.go
+++ b/cmd/puppeth/module_wallet.go
@@ -138,7 +138,7 @@ type walletInfos struct {
webPort int
}
-// Report converts the typed struct into a plain string->string map, cotnaining
+// Report converts the typed struct into a plain string->string map, containing
// most - but not all - fields for reporting to the user.
func (info *walletInfos) Report() map[string]string {
report := map[string]string{
diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go
index 278b5533a..5f781c415 100644
--- a/cmd/puppeth/wizard_dashboard.go
+++ b/cmd/puppeth/wizard_dashboard.go
@@ -33,16 +33,15 @@ func (w *wizard) deployDashboard() {
client := w.servers[server]
// Retrieve any active dashboard configurations from the server
- existed := true
-
infos, err := checkDashboard(client, w.network)
if err != nil {
infos = &dashboardInfos{
port: 80,
host: client.server,
}
- existed = false
}
+ existed := err == nil
+
// Figure out which port to listen on
fmt.Println()
fmt.Printf("Which port should the dashboard listen on? (default = %d)\n", infos.port)
diff --git a/cmd/puppeth/wizard_ethstats.go b/cmd/puppeth/wizard_ethstats.go
index 56dbeb9b4..fb2529c26 100644
--- a/cmd/puppeth/wizard_ethstats.go
+++ b/cmd/puppeth/wizard_ethstats.go
@@ -34,8 +34,6 @@ func (w *wizard) deployEthstats() {
client := w.servers[server]
// Retrieve any active ethstats configurations from the server
- existed := true
-
infos, err := checkEthstats(client, w.network)
if err != nil {
infos = ðstatsInfos{
@@ -43,8 +41,9 @@ func (w *wizard) deployEthstats() {
host: client.server,
secret: "",
}
- existed = false
}
+ existed := err == nil
+
// Figure out which port to listen on
fmt.Println()
fmt.Printf("Which port should ethstats listen on? (default = %d)\n", infos.port)
diff --git a/cmd/puppeth/wizard_explorer.go b/cmd/puppeth/wizard_explorer.go
index ed586bc76..10ef72f78 100644
--- a/cmd/puppeth/wizard_explorer.go
+++ b/cmd/puppeth/wizard_explorer.go
@@ -47,15 +47,14 @@ func (w *wizard) deployExplorer() {
client := w.servers[server]
// Retrieve any active node configurations from the server
- existed := true
-
infos, err := checkExplorer(client, w.network)
if err != nil {
infos = &explorerInfos{
nodePort: 30303, webPort: 80, webHost: client.server,
}
- existed = false
}
+ existed := err == nil
+
chainspec, err := newParityChainSpec(w.network, w.conf.Genesis, w.conf.bootFull)
if err != nil {
log.Error("Failed to create chain spec for explorer", "err", err)
diff --git a/cmd/puppeth/wizard_faucet.go b/cmd/puppeth/wizard_faucet.go
index 7ecb376de..191575b16 100644
--- a/cmd/puppeth/wizard_faucet.go
+++ b/cmd/puppeth/wizard_faucet.go
@@ -35,8 +35,6 @@ func (w *wizard) deployFaucet() {
client := w.servers[server]
// Retrieve any active faucet configurations from the server
- existed := true
-
infos, err := checkFaucet(client, w.network)
if err != nil {
infos = &faucetInfos{
@@ -47,8 +45,9 @@ func (w *wizard) deployFaucet() {
minutes: 1440,
tiers: 3,
}
- existed = false
}
+ existed := err == nil
+
infos.node.genesis, _ = json.MarshalIndent(w.conf.Genesis, "", " ")
infos.node.network = w.conf.Genesis.Config.ChainId.Int64()
diff --git a/cmd/puppeth/wizard_node.go b/cmd/puppeth/wizard_node.go
index 8de1a1b0b..097e2e41a 100644
--- a/cmd/puppeth/wizard_node.go
+++ b/cmd/puppeth/wizard_node.go
@@ -45,8 +45,6 @@ func (w *wizard) deployNode(boot bool) {
client := w.servers[server]
// Retrieve any active node configurations from the server
- existed := true
-
infos, err := checkNode(client, w.network, boot)
if err != nil {
if boot {
@@ -54,8 +52,9 @@ func (w *wizard) deployNode(boot bool) {
} else {
infos = &nodeInfos{portFull: 30303, peersTotal: 50, peersLight: 0, gasTarget: 4.7, gasPrice: 18}
}
- existed = false
}
+ existed := err == nil
+
infos.genesis, _ = json.MarshalIndent(w.conf.Genesis, "", " ")
infos.network = w.conf.Genesis.Config.ChainId.Int64()
diff --git a/cmd/puppeth/wizard_wallet.go b/cmd/puppeth/wizard_wallet.go
index aa6d1c659..7c3896a17 100644
--- a/cmd/puppeth/wizard_wallet.go
+++ b/cmd/puppeth/wizard_wallet.go
@@ -43,15 +43,14 @@ func (w *wizard) deployWallet() {
client := w.servers[server]
// Retrieve any active node configurations from the server
- existed := true
-
infos, err := checkWallet(client, w.network)
if err != nil {
infos = &walletInfos{
nodePort: 30303, rpcPort: 8545, webPort: 80, webHost: client.server,
}
- existed = false
}
+ existed := err == nil
+
infos.genesis, _ = json.MarshalIndent(w.conf.Genesis, "", " ")
infos.network = w.conf.Genesis.Config.ChainId.Int64()
--
cgit v1.2.3