backport fixes from v2

Signed-off-by: Pavel Larkin <[email protected]>

Author: plar

tree_traversal.go

@@ -34,7 +34,7 @@ func (opts traverseOpts) hasAll() bool {
 }
 
 func (opts traverseOpts) hasReverse() bool {
-	return opts&TraverseReverse == TraverseReverse
+	return false
 }
 
 // traverseContext is a context for traversing nodes with 4, 16, or 256 children.
@@ -183,9 +183,7 @@ func traverseOptions(options ...int) traverseOpts {
 		typeOpts = TraverseLeaf // By default filter only leafs
 	}
 
-	orderOpts := opts & TraverseReverse
-
-	return traverseOpts(typeOpts | orderOpts)
+	return traverseOpts(typeOpts)
 }
 
 func traverseFilter(opts traverseOpts, callback Callback) Callback {
@@ -239,7 +237,7 @@ func (tr *tree) traverseChildren(nextFn traverseFunc, children []*nodeRef, cb Ca
 }
 
 func (tr *tree) forEachPrefix(key Key, callback Callback, opts int) traverseAction {
-	opts &= (TraverseLeaf | TraverseReverse) // keep only leaf and reverse options
+	opts &= TraverseLeaf // keep only leaf option
 
 	tr.ForEach(func(n Node) bool {
 		current, ok := n.(*nodeRef)

tree_traversal_test.go

@@ -341,113 +341,6 @@ func TestPrefixTraversalWords(t *testing.T) {
 	assert.Equal(t, expected, found)
 }
 
-func TestPrefixTraversalDescWords(t *testing.T) {
-	t.Parallel()
-
-	var found []string
-
-	tree, _ := treeWithData("test/assets/words.txt")
-	tree.ForEachPrefix(Key("antisa"), func(node Node) bool {
-		if node.Kind() == Leaf {
-			val, ok := node.Value().([]byte)
-			assert.True(t, ok)
-
-			found = append(found, string(val))
-		}
-
-		return true
-	}, TraverseReverse)
-
-	expected := []string{
-		"antisavage",
-		"antisalooner",
-		"antisaloon",
-		"antisacerdotalist",
-		"antisacerdotal",
-	}
-	assert.Equal(t, expected, found)
-}
-
-func TestTraversalForEachWordsBothDirections(t *testing.T) {
-	t.Parallel()
-
-	var (
-		asc  []string
-		desc []string
-	)
-
-	tree, _ := treeWithData("test/assets/words.txt")
-	tree.ForEach(func(node Node) bool {
-		val, ok := node.Value().([]byte)
-		assert.True(t, ok)
-
-		asc = append(asc, string(val))
-
-		return true
-	})
-	assert.Len(t, asc, 235886)
-
-	tree.ForEach(func(node Node) bool {
-		val, ok := node.Value().([]byte)
-		assert.True(t, ok)
-
-		desc = append(desc, string(val))
-
-		return true
-	}, TraverseReverse)
-	assert.Len(t, desc, 235886)
-
-	assert.True(t, areReversedCopies(asc, desc))
-}
-
-func TestTraversalIteratorWordsBothDirections(t *testing.T) {
-	t.Parallel()
-
-	var (
-		asc  []string
-		desc []string
-	)
-
-	tree, _ := treeWithData("test/assets/words.txt")
-	iterateWithCallback(tree.Iterator(), func(node Node) bool {
-		val, ok := node.Value().([]byte)
-		assert.True(t, ok)
-
-		asc = append(asc, string(val))
-
-		return true
-	})
-	assert.Len(t, asc, 235886)
-
-	iterateWithCallback(tree.Iterator(TraverseReverse), func(node Node) bool {
-		val, ok := node.Value().([]byte)
-		assert.True(t, ok)
-
-		desc = append(desc, string(val))
-
-		return true
-	})
-	assert.Len(t, desc, 235886)
-
-	assert.True(t, areReversedCopies(asc, desc))
-}
-
-// areReversedCopies returns true if lhs and rhs are reversed copies of each other.
-func areReversedCopies(lhs, rhs []string) bool {
-	if len(lhs) != len(rhs) {
-		return false
-	}
-
-	n := len(lhs)
-	for i := 0; i < n; i++ {
-		if lhs[i] != rhs[n-i-1] {
-			return false
-		}
-	}
-
-	return true
-}
-
 func TestTreeIterator(t *testing.T) {
 	t.Parallel()