rename prev merge_nodes func to merge_nodes_deprecated
This commit is contained in:
+1
-1
@@ -105,7 +105,7 @@ def reduce_nodes(nodes: list[Node]) -> list[Node]:
|
|||||||
return sort_nodes(nodes)
|
return sort_nodes(nodes)
|
||||||
|
|
||||||
|
|
||||||
def merge_nodes(nodes: list[Node], required_len: int) -> list[Node]:
|
def merge_nodes_deprecated(nodes: list[Node], required_len: int) -> list[Node]:
|
||||||
while len(nodes) > required_len:
|
while len(nodes) > required_len:
|
||||||
nodes = reduce_nodes(nodes)
|
nodes = reduce_nodes(nodes)
|
||||||
return nodes
|
return nodes
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ from cidr4_merger import (
|
|||||||
make_groups,
|
make_groups,
|
||||||
make_parent,
|
make_parent,
|
||||||
merge_neighbors,
|
merge_neighbors,
|
||||||
merge_nodes,
|
merge_nodes_deprecated,
|
||||||
merge_nodes_recursion,
|
merge_nodes_recursion,
|
||||||
reduce_nodes,
|
reduce_nodes,
|
||||||
sort_nodes,
|
sort_nodes,
|
||||||
@@ -183,8 +183,8 @@ def test_reduce_nodes():
|
|||||||
assert str(exc_info.value) == "The top of the tree has no parent!"
|
assert str(exc_info.value) == "The top of the tree has no parent!"
|
||||||
|
|
||||||
|
|
||||||
def test_merge_nodes():
|
def test_merge_nodes_deprecated():
|
||||||
assert merge_nodes(
|
assert merge_nodes_deprecated(
|
||||||
[
|
[
|
||||||
(0, 2, 12, 0),
|
(0, 2, 12, 0),
|
||||||
(2147483648, 2, 1, 2147483648),
|
(2147483648, 2, 1, 2147483648),
|
||||||
@@ -197,7 +197,7 @@ def test_merge_nodes():
|
|||||||
]
|
]
|
||||||
|
|
||||||
with pytest.raises(Exception) as exc_info:
|
with pytest.raises(Exception) as exc_info:
|
||||||
merge_nodes(
|
merge_nodes_deprecated(
|
||||||
[
|
[
|
||||||
(0, 2, 12, 0),
|
(0, 2, 12, 0),
|
||||||
(2147483648, 2, 1, 2147483648),
|
(2147483648, 2, 1, 2147483648),
|
||||||
|
|||||||
Reference in New Issue
Block a user