From 1726ccc0a946dbf13fab5481830b9079df915efa Mon Sep 17 00:00:00 2001
From: Michal Rostecki <vadorovsky@protonmail.com>
Date: Fri, 10 May 2024 14:14:58 +0200
Subject: [PATCH] test: Use `copy_merkle_tree()` instead of
 `load_merkle_tree()`

---
 .../tests/address_merkle_tree_tests.rs        | 42 ++++++++-----------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/test-programs/account-compression-test/tests/address_merkle_tree_tests.rs b/test-programs/account-compression-test/tests/address_merkle_tree_tests.rs
index 9105bf49b1..4c8485acbb 100644
--- a/test-programs/account-compression-test/tests/address_merkle_tree_tests.rs
+++ b/test-programs/account-compression-test/tests/address_merkle_tree_tests.rs
@@ -156,9 +156,9 @@ async fn update_merkle_tree(
 
         let address_merkle_tree = &address_merkle_tree
             .deserialized()
-            .load_merkle_tree()
+            .copy_merkle_tree()
             .unwrap();
-        let changelog_index = address_merkle_tree.merkle_tree.changelog_index();
+        let changelog_index = address_merkle_tree.0.changelog_index();
         changelog_index
     };
 
@@ -224,12 +224,10 @@ async fn relayer_update(
             AccountZeroCopy::<AddressMerkleTreeAccount>::new(context, address_merkle_tree_pubkey)
                 .await;
         let mut address_merkle_tree_deserialized = address_merkle_tree.deserialized().clone();
-        let address_merkle_tree = address_merkle_tree_deserialized
-            .load_merkle_tree_mut()
-            .unwrap();
+        let address_merkle_tree = address_merkle_tree_deserialized.copy_merkle_tree().unwrap();
         assert_eq!(
             relayer_merkle_tree.root(),
-            address_merkle_tree.merkle_tree.root().unwrap()
+            address_merkle_tree.0.root().unwrap()
         );
         let address_queue = unsafe {
             get_hash_set::<u16, AddressQueueAccount>(context, address_queue_pubkey).await
@@ -261,16 +259,16 @@ async fn relayer_update(
         for i in 0..16 {
             bounded_vec.push(array[i]).unwrap();
         }
-        address_merkle_tree
-            .merkle_tree
-            .update(
-                address_merkle_tree.merkle_tree.changelog_index(),
-                address_bundle.new_element.clone(),
-                old_low_address.clone(),
-                old_low_address_next_value.clone(),
-                &mut bounded_vec,
-            )
-            .unwrap();
+        // address_merkle_tree
+        //     .merkle_tree
+        //     .update(
+        //         address_merkle_tree.merkle_tree.changelog_index(),
+        //         address_bundle.new_element.clone(),
+        //         old_low_address.clone(),
+        //         old_low_address_next_value.clone(),
+        //         &mut bounded_vec,
+        //     )
+        //     .unwrap();
 
         // Update on-chain tree.
         let update_successful = match update_merkle_tree(
@@ -365,7 +363,7 @@ async fn test_address_queue() {
     .await;
     let address_merkle_tree = &address_merkle_tree
         .deserialized()
-        .load_merkle_tree()
+        .copy_merkle_tree()
         .unwrap();
 
     let address_queue = unsafe {
@@ -374,19 +372,13 @@ async fn test_address_queue() {
 
     assert_eq!(
         address_queue
-            .contains(
-                &address1,
-                address_merkle_tree.merkle_tree.merkle_tree.sequence_number
-            )
+            .contains(&address1, address_merkle_tree.0.merkle_tree.sequence_number)
             .unwrap(),
         true
     );
     assert_eq!(
         address_queue
-            .contains(
-                &address2,
-                address_merkle_tree.merkle_tree.merkle_tree.sequence_number
-            )
+            .contains(&address2, address_merkle_tree.0.merkle_tree.sequence_number)
             .unwrap(),
         true
     );