WEB3-148: Update alloy-trie requirement from 0.5 to 0.6 (#255)

risc0 · Sep 30, 2024 · cfeb381 · cfeb381
1 parent db93c1b
commit cfeb381
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,7 +30,7 @@ alloy-sol-types = { version = "0.8" }
 
 # Alloy host dependencies
 alloy = { version = "0.3" }
-alloy-trie = { version = "0.5" }
+alloy-trie = { version = "0.6" }
 
 # Beacon chain support
 ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus.git", rev = "cf3c404043230559660810bc0c9d6d5a8498d819" }

diff --git a/steel/src/mpt.rs b/steel/src/mpt.rs
@@ -507,7 +507,14 @@ mod tests {
         let exp_hash = hasher.root();
 
         // reconstruct the trie from the RLP encoded proofs and verify the root hash
-        let mpt = MerkleTrie::from_rlp_nodes(hasher.take_proofs().into_values()).unwrap();
+        let mpt = MerkleTrie::from_rlp_nodes(
+            hasher
+                .take_proof_nodes()
+                .into_nodes_sorted()
+                .into_iter()
+                .map(|node| node.1),
+        )
+        .unwrap();
         assert!(mpt.0.rlp_encoded().len() < 32);
         assert_eq!(mpt.hash_slow(), exp_hash);
     }
@@ -534,7 +541,14 @@ mod tests {
         let exp_hash = hasher.root();
 
         // reconstruct the trie from the RLP encoded proofs and verify the root hash
-        let mpt = MerkleTrie::from_rlp_nodes(hasher.take_proofs().into_values()).unwrap();
+        let mpt = MerkleTrie::from_rlp_nodes(
+            hasher
+                .take_proof_nodes()
+                .into_nodes_sorted()
+                .into_iter()
+                .map(|node| node.1),
+        )
+        .unwrap();
         assert_eq!(mpt.hash_slow(), exp_hash);
     }