etcdserver: cleanup cluster_util

etcdserver/cluster_util.go

@@ -26,14 +26,11 @@ import (
 	"github.com/coreos/etcd/pkg/types"
 )
 
-// isBootstrapped tries to check if the given member has been bootstrapped
+// isMemberBootstrapped tries to check if the given member has been bootstrapped
 // in the given cluster.
-func isBootstrapped(cfg *ServerConfig) bool {
-	cl := cfg.Cluster
-	member := cfg.Name
-
+func isMemberBootstrapped(cl *Cluster, member string, tr *http.Transport) bool {
 	us := getOtherPeerURLs(cl, member)
-	rcl, err := getClusterFromPeers(us, false, cfg.Transport)
+	rcl, err := getClusterFromPeers(us, false, tr)
 	if err != nil {
 		return false
 	}

etcdserver/server.go

@@ -173,7 +173,7 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {
 			return nil, err
 		}
 		m := cfg.Cluster.MemberByName(cfg.Name)
-		if isBootstrapped(cfg) {
+		if isMemberBootstrapped(cfg.Cluster, cfg.Name, cfg.Transport) {
 			return nil, fmt.Errorf("member %s has already been bootstrapped", m.ID)
 		}
 		if cfg.ShouldDiscover() {