Rename calc_merkle_root to get_merkle_root_from_items

Author: hwwhww

eth/_utils/blobs.py

@@ -17,7 +17,7 @@
     zpad_right,
 )
 from eth._utils.merkle import (
-    calc_merkle_root,
+    get_merkle_root_from_items,
 )
 
 from eth.constants import (
@@ -44,7 +44,7 @@ def iterate_chunks(collation_body: bytes) -> Iterator[Hash32]:
 def calc_chunk_root(collation_body: bytes) -> Hash32:
     check_body_size(collation_body)
     chunks = list(iterate_chunks(collation_body))
-    return calc_merkle_root(chunks)
+    return get_merkle_root_from_items(chunks)
 
 
 def check_body_size(body: bytes) -> bytes:

eth/_utils/merkle.py

@@ -115,7 +115,7 @@ def calc_merkle_tree(items: Sequence[Union[bytes, bytearray]]) -> MerkleTree:
     return calc_merkle_tree_from_leaves(leaves)
 
 
-def calc_merkle_root(items: Sequence[Union[bytes, bytearray]]) -> Hash32:
+def get_merkle_root_from_items(items: Sequence[Union[bytes, bytearray]]) -> Hash32:
     """
     Calculate the Merkle root corresponding to a list of items.
     """

tests/core/merkle-utils/test_merkle_trees.py

@@ -9,7 +9,7 @@
 )
 
 from eth._utils.merkle import (
-    calc_merkle_root,
+    get_merkle_root_from_items,
     calc_merkle_tree,
     get_root,
     get_merkle_proof,
@@ -65,13 +65,13 @@ def test_merkle_tree_calculation(leaves, tree):
     calculated_tree = calc_merkle_tree(leaves)
     assert calculated_tree == tree
     assert get_root(tree) == tree[0][0]
-    assert calc_merkle_root(leaves) == get_root(tree)
+    assert get_merkle_root_from_items(leaves) == get_root(tree)
 
 
 @pytest.mark.parametrize("leave_number", [0, 3, 5, 6, 7, 9])
 def test_invalid_merkle_root_calculation(leave_number):
     with pytest.raises(ValueError):
-        calc_merkle_root((b"",) * leave_number)
+        get_merkle_root_from_items((b"",) * leave_number)
 
 
 @pytest.mark.parametrize("leaves,index,proof", [