etcdserver: MemberFromName -> MemberByName

etcdserver/cluster.go

@@ -141,7 +141,7 @@ func (c *Cluster) Member(id uint64) *Member {
 	return c.members[id]
 }
 
-func (c *Cluster) MemberFromName(name string) *Member {
+func (c *Cluster) MemberByName(name string) *Member {
 	for _, m := range c.members {
 		if m.Name == name {
 			return m

etcdserver/cluster_test.go

@@ -147,7 +147,7 @@ func TestClusterMemberFromName(t *testing.T) {
 	}
 	for i, tt := range tests {
 		c := newTestCluster(membs)
-		m := c.MemberFromName(tt.name)
+		m := c.MemberByName(tt.name)
 		if g := m != nil; g != tt.match {
 			t.Errorf("#%d: find member = %v, want %v", i, g, tt.match)
 		}

etcdserver/config.go

@@ -40,7 +40,7 @@ type ServerConfig struct {
 // VerifyBootstrapConfig sanity-checks the initial config and returns an error
 // for things that should never happen.
 func (c *ServerConfig) VerifyBootstrapConfig() error {
-	m := c.Cluster.MemberFromName(c.Name)
+	m := c.Cluster.MemberByName(c.Name)
 	// Make sure the cluster at least contains the local server.
 	if m == nil {
 		return fmt.Errorf("couldn't find local name %s in the initial cluster configuration", c.Name)

etcdserver/server.go

@@ -180,7 +180,7 @@ func NewServer(cfg *ServerConfig) *EtcdServer {
 		if err := cfg.VerifyBootstrapConfig(); err != nil {
 			log.Fatalf("etcdserver: %v", err)
 		}
-		m := cfg.Cluster.MemberFromName(cfg.Name)
+		m := cfg.Cluster.MemberByName(cfg.Name)
 		if cfg.ShouldDiscover() {
 			d, err := discovery.New(cfg.DiscoveryURL, m.ID, cfg.Cluster.String())
 			if err != nil {
@@ -646,7 +646,7 @@ func startNode(cfg *ServerConfig) (id uint64, n raft.Node, w *wal.WAL) {
 	var err error
 	// TODO: remove the discoveryURL when it becomes part of the source for
 	// generating nodeID.
-	member := cfg.Cluster.MemberFromName(cfg.Name)
+	member := cfg.Cluster.MemberByName(cfg.Name)
 	cfg.Cluster.GenID([]byte(cfg.DiscoveryURL))
 	metadata := pbutil.MustMarshal(&pb.Metadata{NodeID: member.ID, ClusterID: cfg.Cluster.ID()})
 	if w, err = wal.Create(cfg.WALDir(), metadata); err != nil {