From a4d8488be98b8c380537e01bf260b8a3b47208a7 Mon Sep 17 00:00:00 2001
From: Menno Pruijssers <menno@uber.com>
Date: Fri, 16 Dec 2016 10:37:49 +0100
Subject: [PATCH] rename traverse function

---
 hashring/rbtree.go      | 12 ++++++------
 hashring/rbtree_test.go |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hashring/rbtree.go b/hashring/rbtree.go
index d543459f..86a33d4e 100644
--- a/hashring/rbtree.go
+++ b/hashring/rbtree.go
@@ -261,10 +261,10 @@ func (n *redBlackNode) search(key keytype) (valuetype, bool) {
 	return nil, false
 }
 
-// traverseUntil traverses the nodes in the tree in-order invoking `traverse` for each node. If the
-// traverse function returns `false`, traversal is stopped and no more nodes will be
+// traverseWhile traverses the nodes in the tree in-order invoking the `condition`-function argument for each node.
+// If the condition-function returns `false` traversal is stopped and no more nodes will be
 // visited. Returns `true` if all nodes are visited; `false` if not.
-func (n *redBlackNode) traverseUntil(traverse func(*redBlackNode) bool) bool {
+func (n *redBlackNode) traverseWhile(condition func(*redBlackNode) bool) bool {
 	if n == nil {
 		// the end of the tree does not signal the end of walking, but we can't
 		// walk this node (nil) nor left or right anymore
@@ -272,17 +272,17 @@ func (n *redBlackNode) traverseUntil(traverse func(*redBlackNode) bool) bool {
 	}
 
 	// walk left first
-	if !n.left.traverseUntil(traverse) {
+	if !n.left.traverseWhile(condition) {
 		// stop if walker indicated to break
 		return false
 	}
 	// now visit this node
-	if !traverse(n) {
+	if !condition(n) {
 		// stop if walker indicated to break
 		return false
 	}
 	// lastly visit right
-	if !n.right.traverseUntil(traverse) {
+	if !n.right.traverseWhile(condition) {
 		// stop if walker indicated to break
 		return false
 	}
diff --git a/hashring/rbtree_test.go b/hashring/rbtree_test.go
index b45a65bc..26933aae 100644
--- a/hashring/rbtree_test.go
+++ b/hashring/rbtree_test.go
@@ -650,7 +650,7 @@ func TestTraverseOrder(t *testing.T) {
 
 	var last keytype
 
-	tree.root.traverseUntil(func(n *redBlackNode) bool {
+	tree.root.traverseWhile(func(n *redBlackNode) bool {
 		current := n.key
 		if last != nil {
 			assert.True(t, current.Compare(last) > 0, "expected walk to walk the nodes in natural order as dictated by the Compare function")
@@ -673,7 +673,7 @@ func TestTraverseEscape(t *testing.T) {
 
 	var visited []int
 
-	tree.root.traverseUntil(func(n *redBlackNode) bool {
+	tree.root.traverseWhile(func(n *redBlackNode) bool {
 		number := int(n.key.(treeTestInt))
 		visited = append(visited, number)
 		// stop at node 5, it should exit on a left, right and visiting node,