Merge pull request #287 from ethereum/system-testing

Seednode CLI param updates

cmd/ethereum/flags.go

@@ -49,7 +49,7 @@ var (
 	AddPeer         string
 	MaxPeer         int
 	GenAddr         bool
-	UseSeed         bool
+	SeedNode        string
 	SecretFile      string
 	ExportDir       string
 	NonInteractive  bool
@@ -101,7 +101,7 @@ func Init() {
 	flag.BoolVar(&StartRpc, "rpc", false, "start rpc server")
 	flag.BoolVar(&StartWebSockets, "ws", false, "start websocket server")
 	flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)")
-	flag.BoolVar(&UseSeed, "seed", true, "seed peers")
+	flag.StringVar(&SeedNode, "seednode", "poc-8.ethdev.com:30303", "ip:port of seed node to connect to. Set to blank for skip")
 	flag.BoolVar(&SHH, "shh", true, "whisper protocol (on)")
 	flag.BoolVar(&Dial, "dial", true, "dial out connections (on)")
 	flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key")

cmd/ethereum/main.go

@@ -134,7 +134,7 @@ func main() {
 		utils.StartWebSockets(ethereum, WsPort)
 	}
 
-	utils.StartEthereum(ethereum, UseSeed)
+	utils.StartEthereum(ethereum, SeedNode)
 
 	if StartJsConsole {
 		InitJsConsole(ethereum)

cmd/mist/flags.go

@@ -51,7 +51,7 @@ var (
 	AddPeer         string
 	MaxPeer         int
 	GenAddr         bool
-	UseSeed         bool
+	SeedNode        string
 	SecretFile      string
 	ExportDir       string
 	NonInteractive  bool
@@ -116,7 +116,7 @@ func Init() {
 	flag.BoolVar(&StartRpc, "rpc", true, "start rpc server")
 	flag.BoolVar(&StartWebSockets, "ws", false, "start websocket server")
 	flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)")
-	flag.BoolVar(&UseSeed, "seed", true, "seed peers")
+	flag.StringVar(&SeedNode, "seednode", "poc-8.ethdev.com:30303", "ip:port of seed node to connect to. Set to blank for skip")
 	flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key")
 	flag.StringVar(&NatType, "nat", "", "NAT support (UPNP|PMP) (none)")
 	flag.StringVar(&SecretFile, "import", "", "imports the file given (hex or mnemonic formats)")

cmd/mist/main.go

@@ -84,7 +84,7 @@ func run() error {
 	utils.RegisterInterrupt(func(os.Signal) {
 		gui.Stop()
 	})
-	go utils.StartEthereum(ethereum, UseSeed)
+	go utils.StartEthereum(ethereum, SeedNode)
 
 	fmt.Println("ETH stack took", time.Since(tstart))
 

cmd/mist/ui_lib.go

@@ -136,7 +136,7 @@ func (ui *UiLib) Muted(content string) {
 
 func (ui *UiLib) Connect(button qml.Object) {
 	if !ui.connected {
-		ui.eth.Start(true)
+		ui.eth.Start(SeedNode)
 		ui.connected = true
 		button.Set("enabled", false)
 	}

cmd/utils/cmd.go

@@ -121,9 +121,9 @@ func exit(err error) {
 	os.Exit(status)
 }
 
-func StartEthereum(ethereum *eth.Ethereum, UseSeed bool) {
+func StartEthereum(ethereum *eth.Ethereum, SeedNode string) {
 	clilogger.Infof("Starting %s", ethereum.ClientIdentity())
-	err := ethereum.Start(UseSeed)
+	err := ethereum.Start(SeedNode)
 	if err != nil {
 		exit(err)
 	}

eth/backend.go

@@ -17,10 +17,6 @@ import (
 	"github.com/ethereum/go-ethereum/whisper"
 )
 
-const (
-	seedNodeAddress = "poc-8.ethdev.com:30303"
-)
-
 type Config struct {
 	Name       string
 	Version    string
@@ -223,7 +219,7 @@ func (s *Ethereum) Coinbase() []byte {
 }
 
 // Start the ethereum
-func (s *Ethereum) Start(seed bool) error {
+func (s *Ethereum) Start(seedNode string) error {
 	err := s.net.Start()
 	if err != nil {
 		return err
@@ -246,9 +242,9 @@ func (s *Ethereum) Start(seed bool) error {
 	go s.blockBroadcastLoop()
 
 	// TODO: read peers here
-	if seed {
+	if len(seedNode) > 0 {
-		logger.Infof("Connect to seed node %v", seedNodeAddress)
+		logger.Infof("Connect to seed node %v", seedNode)
-		if err := s.SuggestPeer(seedNodeAddress); err != nil {
+		if err := s.SuggestPeer(seedNode); err != nil {
 			logger.Infoln(err)
 		}
 	}