From 3d4e1f59dc28e1f3b089ed9a04bbf5c29e08b300 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian@waldon.cc>
Date: Tue, 27 Jan 2015 11:47:08 -0800
Subject: [PATCH] client: drop unnecessary Nodes type

---
 client/keys.go              | 11 +++++------
 discovery/discovery.go      | 16 ++++++++--------
 discovery/discovery_test.go |  8 ++++----
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/client/keys.go b/client/keys.go
index 9e0bbc414..5322206d1 100644
--- a/client/keys.go
+++ b/client/keys.go
@@ -95,13 +95,12 @@ type Response struct {
 	Index    uint64
 }
 
-type Nodes []*Node
 type Node struct {
-	Key           string `json:"key"`
-	Value         string `json:"value"`
-	Nodes         Nodes  `json:"nodes"`
-	ModifiedIndex uint64 `json:"modifiedIndex"`
-	CreatedIndex  uint64 `json:"createdIndex"`
+	Key           string  `json:"key"`
+	Value         string  `json:"value"`
+	Nodes         []*Node `json:"nodes"`
+	ModifiedIndex uint64  `json:"modifiedIndex"`
+	CreatedIndex  uint64  `json:"createdIndex"`
 }
 
 func (n *Node) String() string {
diff --git a/discovery/discovery.go b/discovery/discovery.go
index 1034bd260..d7520dd63 100644
--- a/discovery/discovery.go
+++ b/discovery/discovery.go
@@ -195,7 +195,7 @@ func (d *discovery) createSelf(contents string) error {
 	return err
 }
 
-func (d *discovery) checkCluster() (client.Nodes, int, uint64, error) {
+func (d *discovery) checkCluster() ([]*client.Node, int, uint64, error) {
 	configKey := path.Join("/", d.cluster, "_config")
 	ctx, cancel := context.WithTimeout(context.Background(), client.DefaultRequestTimeout)
 	// find cluster size
@@ -224,7 +224,7 @@ func (d *discovery) checkCluster() (client.Nodes, int, uint64, error) {
 		}
 		return nil, 0, 0, err
 	}
-	nodes := make(client.Nodes, 0)
+	nodes := make([]*client.Node, 0)
 	// append non-config keys to nodes
 	for _, n := range resp.Node.Nodes {
 		if !(path.Base(n.Key) == path.Base(configKey)) {
@@ -254,7 +254,7 @@ func (d *discovery) logAndBackoffForRetry(step string) {
 	d.clock.Sleep(retryTime)
 }
 
-func (d *discovery) checkClusterRetry() (client.Nodes, int, uint64, error) {
+func (d *discovery) checkClusterRetry() ([]*client.Node, int, uint64, error) {
 	if d.retries < nRetries {
 		d.logAndBackoffForRetry("cluster status check")
 		return d.checkCluster()
@@ -262,7 +262,7 @@ func (d *discovery) checkClusterRetry() (client.Nodes, int, uint64, error) {
 	return nil, 0, 0, ErrTooManyRetries
 }
 
-func (d *discovery) waitNodesRetry() (client.Nodes, error) {
+func (d *discovery) waitNodesRetry() ([]*client.Node, error) {
 	if d.retries < nRetries {
 		d.logAndBackoffForRetry("waiting for other nodes")
 		nodes, n, index, err := d.checkCluster()
@@ -274,13 +274,13 @@ func (d *discovery) waitNodesRetry() (client.Nodes, error) {
 	return nil, ErrTooManyRetries
 }
 
-func (d *discovery) waitNodes(nodes client.Nodes, size int, index uint64) (client.Nodes, error) {
+func (d *discovery) waitNodes(nodes []*client.Node, size int, index uint64) ([]*client.Node, error) {
 	if len(nodes) > size {
 		nodes = nodes[:size]
 	}
 	// watch from the next index
 	w := d.c.Watcher(d.cluster, &client.WatcherOptions{WaitIndex: index + 1, Recursive: true})
-	all := make(client.Nodes, len(nodes))
+	all := make([]*client.Node, len(nodes))
 	copy(all, nodes)
 	for _, n := range all {
 		if path.Base(n.Key) == path.Base(d.selfKey()) {
@@ -311,7 +311,7 @@ func (d *discovery) selfKey() string {
 	return path.Join("/", d.cluster, d.id.String())
 }
 
-func nodesToCluster(ns client.Nodes) string {
+func nodesToCluster(ns []*client.Node) string {
 	s := make([]string, len(ns))
 	for i, n := range ns {
 		s[i] = n.Value
@@ -319,7 +319,7 @@ func nodesToCluster(ns client.Nodes) string {
 	return strings.Join(s, ",")
 }
 
-type sortableNodes struct{ client.Nodes }
+type sortableNodes struct{ Nodes []*client.Node }
 
 func (ns sortableNodes) Len() int { return len(ns.Nodes) }
 func (ns sortableNodes) Less(i, j int) bool {
diff --git a/discovery/discovery_test.go b/discovery/discovery_test.go
index 96941a41c..d8bb0080c 100644
--- a/discovery/discovery_test.go
+++ b/discovery/discovery_test.go
@@ -226,14 +226,14 @@ func TestCheckCluster(t *testing.T) {
 }
 
 func TestWaitNodes(t *testing.T) {
-	all := client.Nodes{
+	all := []*client.Node{
 		0: {Key: "/1000/1", CreatedIndex: 2},
 		1: {Key: "/1000/2", CreatedIndex: 3},
 		2: {Key: "/1000/3", CreatedIndex: 4},
 	}
 
 	tests := []struct {
-		nodes client.Nodes
+		nodes []*client.Node
 		rs    []*client.Response
 	}{
 		{
@@ -341,7 +341,7 @@ func TestCreateSelf(t *testing.T) {
 }
 
 func TestNodesToCluster(t *testing.T) {
-	nodes := client.Nodes{
+	nodes := []*client.Node{
 		0: {Key: "/1000/1", Value: "1=1.1.1.1", CreatedIndex: 1},
 		1: {Key: "/1000/2", Value: "2=2.2.2.2", CreatedIndex: 2},
 		2: {Key: "/1000/3", Value: "3=3.3.3.3", CreatedIndex: 3},
@@ -355,7 +355,7 @@ func TestNodesToCluster(t *testing.T) {
 }
 
 func TestSortableNodes(t *testing.T) {
-	ns := client.Nodes{
+	ns := []*client.Node{
 		0: {CreatedIndex: 5},
 		1: {CreatedIndex: 1},
 		2: {CreatedIndex: 3},