using the stackoverflow-safe version of the initialize_with_root call…

… + minor fmt
solana-labs · Jun 25, 2024 · 2191e25 · 2191e25
1 parent 3ec1114
commit 2191e25
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/account-compression/Cargo.lock b/account-compression/Cargo.lock
diff --git a/account-compression/programs/account-compression/src/lib.rs b/account-compression/programs/account-compression/src/lib.rs
@@ -308,17 +308,14 @@ pub mod spl_account_compression {
         assert_eq!(proof.len(), header.get_max_depth() as usize);
 
         let id = ctx.accounts.merkle_tree.key();
-        // A call is made to ConcurrentMerkleTree::initialize_with_root(root, rightmost_leaf, proof, rightmost_index)
-        let change_log = merkle_tree_apply_fn_mut!(
-            header,
-            id,
-            tree_bytes,
-            initialize_with_root,
+        // A call is made to ConcurrentMerkleTree::initialize_with_root
+        let args = &InitializeWithRootArgs {
             root,
             rightmost_leaf,
-            &proof,
-            rightmost_index
-        )?;
+            proof_vec: proof,
+            index: rightmost_index,
+        };
+        let change_log = merkle_tree_initialize_with_root(&header, id, tree_bytes, args)?;
         update_canopy(canopy_bytes, header.get_max_depth(), Some(&change_log))?;
         wrap_event(
             &AccountCompressionEvent::ChangeLog(*change_log),

diff --git a/libraries/concurrent-merkle-tree/src/node.rs b/libraries/concurrent-merkle-tree/src/node.rs
@@ -27,9 +27,8 @@ pub fn empty_node_cached<const N: usize>(level: u32, cache: &[Node; N]) -> Node
     data
 }
 
-
 /// Calculates and caches the hash of empty nodes up to level i
-pub fn empty_node_cached_mut<const N: usize>(level: u32, cache: &mut[Node; N]) -> Node {
+pub fn empty_node_cached_mut<const N: usize>(level: u32, cache: &mut [Node; N]) -> Node {
     let mut data = EMPTY;
     if level != 0 {
         let target = (level - 1) as usize;