diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2018-02-13 17:43:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 17:43:50 +0800 |
| commit | da41a7258d94fb35113f3b2da3635c7c451e5831 (patch) | |
| tree | c123e7994d514a6c58a74e5897a5e2ef27f6cd8f /cmd/puppeth/module_faucet.go | |
| parent | 8d32c4b9906d2a97149c4312998d46e924d863d7 (diff) | |
| parent | 12dab534958c5a91fdba470836a91de545681288 (diff) | |
| download | dexon-da41a7258d94fb35113f3b2da3635c7c451e5831.tar dexon-da41a7258d94fb35113f3b2da3635c7c451e5831.tar.gz dexon-da41a7258d94fb35113f3b2da3635c7c451e5831.tar.bz2 dexon-da41a7258d94fb35113f3b2da3635c7c451e5831.tar.lz dexon-da41a7258d94fb35113f3b2da3635c7c451e5831.tar.xz dexon-da41a7258d94fb35113f3b2da3635c7c451e5831.tar.zst dexon-da41a7258d94fb35113f3b2da3635c7c451e5831.zip | |
Merge pull request #16073 from karalabe/puppeth-unify-discovery
cmd/puppeth: unify discv4 and discv5 ports
Diffstat (limited to 'cmd/puppeth/module_faucet.go')
| -rw-r--r-- | cmd/puppeth/module_faucet.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go index 92b4cb286..976bf04d0 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -93,7 +93,7 @@ func deployFaucet(client *sshClient, network string, bootnodes []string, config "NetworkID": config.node.network, "Bootnodes": strings.Join(bootnodes, ","), "Ethstats": config.node.ethstats, - "EthPort": config.node.portFull, + "EthPort": config.node.port, "CaptchaToken": config.captchaToken, "CaptchaSecret": config.captchaSecret, "FaucetName": strings.Title(network), @@ -110,7 +110,7 @@ func deployFaucet(client *sshClient, network string, bootnodes []string, config "Datadir": config.node.datadir, "VHost": config.host, "ApiPort": config.port, - "EthPort": config.node.portFull, + "EthPort": config.node.port, "EthName": config.node.ethstats[:strings.Index(config.node.ethstats, ":")], "CaptchaToken": config.captchaToken, "CaptchaSecret": config.captchaSecret, @@ -158,7 +158,7 @@ func (info *faucetInfos) Report() map[string]string { report := map[string]string{ "Website address": info.host, "Website listener port": strconv.Itoa(info.port), - "Ethereum listener port": strconv.Itoa(info.node.portFull), + "Ethereum listener port": strconv.Itoa(info.node.port), "Funding amount (base tier)": fmt.Sprintf("%d Ethers", info.amount), "Funding cooldown (base tier)": fmt.Sprintf("%d mins", info.minutes), "Funding tiers": strconv.Itoa(info.tiers), @@ -228,7 +228,7 @@ func checkFaucet(client *sshClient, network string) (*faucetInfos, error) { return &faucetInfos{ node: &nodeInfos{ datadir: infos.volumes["/root/.faucet"], - portFull: infos.portmap[infos.envvars["ETH_PORT"]+"/tcp"], + port: infos.portmap[infos.envvars["ETH_PORT"]+"/tcp"], ethstats: infos.envvars["ETH_NAME"], keyJSON: keyJSON, keyPass: keyPass, |