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

cmd/puppeth/puppeth.go

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

cmd/puppeth/wizard.go

@@ -76,10 +76,10 @@ type wizard struct {
 	servers  map[string]*sshClient // SSH connections to servers to administer
 	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
 	consensusType	string
-        blocksTime	uint64
+	blocksTime	uint64
 	sealAccounts	string
 	preFundedAccounts	string
 	preCmpAddOneWei		string

cmd/puppeth/wizard_genesis.go

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