PR feedback

Author: hwwhww

eth/_utils/merkle.py

@@ -8,10 +8,10 @@
 import math
 from typing import (
     cast,
-    Hashable,
     Iterable,
     NewType,
     Sequence,
+    Union,
 )
 
 from cytoolz import (
@@ -78,7 +78,7 @@ def _calc_parent_hash(left_node: Hash32, right_node: Hash32) -> Hash32:
 
 
 def verify_merkle_proof(root: Hash32,
-                        item: Hashable,
+                        item: Union[bytes, bytearray],
                         item_index: int,
                         proof: MerkleProof) -> bool:
     """
@@ -108,15 +108,15 @@ def _hash_layer(layer: Sequence[Hash32]) -> Iterable[Hash32]:
     )
 
 
-def calc_merkle_tree(items: Sequence[Hashable]) -> MerkleTree:
+def calc_merkle_tree(items: Sequence[Union[bytes, bytearray]]) -> MerkleTree:
     """
     Calculate the Merkle tree corresponding to a list of items.
     """
     leaves = tuple(hash_eth2(item) for item in items)
     return calc_merkle_tree_from_leaves(leaves)
 
 
-def calc_merkle_root(items: Sequence[Hashable]) -> Hash32:
+def calc_merkle_root(items: Sequence[Union[bytes, bytearray]]) -> Hash32:
     """
     Calculate the Merkle root corresponding to a list of items.
     """
@@ -133,11 +133,15 @@ def calc_merkle_tree_from_leaves(leaves: Sequence[Hash32]) -> MerkleTree:
     tree = cast(
         MerkleTree,
         tuple(
-            take(
-                n_layers,
-                iterate(_hash_layer, leaves),
+            reversed(
+                tuple(
+                    take(
+                        n_layers,
+                        iterate(_hash_layer, leaves),
+                    )
+                )
             )
-        )[::-1]
+        )
     )
     if len(tree[0]) != 1:
         raise Exception("Invariant: There must only be one root")

eth/beacon/_utils/hash.py

@@ -1,12 +1,12 @@
 from typing import (
-    Hashable,
+    Union,
 )
 
 from eth_typing import Hash32
 from eth_hash.auto import keccak
 
 
-def hash_eth2(data: Hashable) -> Hash32:
+def hash_eth2(data: Union[bytes, bytearray]) -> Hash32:
     """
     Return Keccak-256 hashed result.
     Note: it's a placeholder and we aim to migrate to a S[T/N]ARK-friendly hash function in