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

Merge branch 'master' of https://github.com/dipingxian2/go-ethereum

Browse source
This commit is contained in:
Ubuntu 2020-02-13 06:20:33 +00:00
commit eb6cb3dbf9
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/puppeth/puppeth.go
View file

@ -89,7 +89,7 @@ func runWizard(c *cli.Context) error {
blocksTime := uint64(c.Int("blocksTime")) blocksTime := uint64(c.Int("blocksTime"))
sealAccounts := c.String("sealAccounts") sealAccounts := c.String("sealAccounts")
preFundedAccounts := c.String("preFundedAccounts") preFundedAccounts := c.String("preFundedAccounts")
preCmpAddOneWei := c.String("preCmpAddressWithOneWei") preCmpAddOneWei := c.String("preCmpAddressWithOneWei")
networkID := c.Uint64("networkID") networkID := c.Uint64("networkID")
nonInteract := network != "" && consensusType != "" && blocksTime > 0 && sealAccounts != "" && preFundedAccounts != "" && preCmpAddOneWei != "" && networkID > 0 nonInteract := network != "" && consensusType != "" && blocksTime > 0 && sealAccounts != "" && preFundedAccounts != "" && preCmpAddOneWei != "" && networkID > 0

4
cmd/puppeth/wizard.go
View file

@ -76,10 +76,10 @@ type wizard struct {
servers map[string]*sshClient // SSH connections to servers to administer servers map[string]*sshClient // SSH connections to servers to administer
services map[string][]string // Ethereum services known to be running on servers services map[string][]string // Ethereum services known to be running on servers
in *bufio.Reader // Wrapper around stdin to allow reading user input in *bufio.Reader // Wrapper around stdin to allow reading user input
lock sync.Mutex // Lock to protect configs during concurrent service discovery lock sync.Mutex // Lock to protect configs during concurrent service discovery
consensusType string consensusType string
blocksTime uint64 blocksTime uint64
sealAccounts string sealAccounts string
preFundedAccounts string preFundedAccounts string
preCmpAddOneWei string preCmpAddOneWei string

6
cmd/puppeth/wizard_genesis.go
View file

@ -64,7 +64,7 @@ func (w *wizard) makeGenesis() {
if w.consensusType != "" { if w.consensusType != "" {
choice = w.consensusType choice = w.consensusType
fmt.Println(w.consensusType) fmt.Println(w.consensusType)
}else{ } else {
choice = w.read() choice = w.read()
} }
switch { switch {
@ -84,7 +84,7 @@ func (w *wizard) makeGenesis() {
fmt.Println("How many seconds should blocks take? (default = 15)") fmt.Println("How many seconds should blocks take? (default = 15)")
if w.blocksTime > 0 { if w.blocksTime > 0 {
genesis.Config.Clique.Period = w.blocksTime genesis.Config.Clique.Period = w.blocksTime
}else{ } else {
genesis.Config.Clique.Period = uint64(w.readDefaultInt(15)) genesis.Config.Clique.Period = uint64(w.readDefaultInt(15))
} }
@ -133,7 +133,7 @@ func (w *wizard) makeGenesis() {
} }
continue continue
} }
}else{ } else {
for { for {
// Read the address of the account to fund // Read the address of the account to fund
if address := w.readAddress(); address != nil { if address := w.readAddress(); address != nil {