Merge stylistic comments

etcdserver/cluster.go

@@ -37,8 +37,7 @@ type Cluster struct {
 }
 
 func NewCluster(clusterName string) *Cluster {
-	c := &Cluster{name: clusterName, members: make(map[uint64]*Member)}
-	return c
+	return &Cluster{name: clusterName, members: make(map[uint64]*Member)}
 }
 
 func (c Cluster) FindName(name string) *Member {

etcdserver/config.go

@@ -50,13 +50,8 @@ func (c *ServerConfig) VerifyBootstrapConfig() error {
 	}
 
 	// Make sure the cluster at least contains the local server.
-	isOk := false
-	for _, m := range c.Cluster.members {
-		if m.ID == c.NodeID {
-			isOk = true
-		}
-	}
-	if !isOk {
+	m := c.Cluster.FindID(c.NodeID)
+	if m == nil {
 		return fmt.Errorf("couldn't find local ID in cluster config")
 	}
 

integration/cluster_test.go

@@ -90,12 +90,11 @@ func (c *cluster) Launch(t *testing.T) {
 		l := newLocalListener(t)
 		// each member claims only one peer listener
 		lns[i] = l
-		listenUrls, err := types.NewURLs([]string{"http://" + l.Addr().String()})
+		listenURLs, err := types.NewURLs([]string{"http://" + l.Addr().String()})
 		if err != nil {
 			t.Fatal(err)
 		}
-		_, err = clusterCfg.AddMemberFromURLs(c.name(i), listenUrls)
-		if err != nil {
+		if _, err = clusterCfg.AddMemberFromURLs(c.name(i), listenURLs); err != nil {
 			t.Fatal(err)
 		}
 	}
@@ -150,7 +149,6 @@ func newLocalListener(t *testing.T) net.Listener {
 }
 
 type member struct {
-	id uint64
 	etcdserver.ServerConfig
 	PeerListeners, ClientListeners []net.Listener