fix: impl suggestions

merkle-tree/concurrent/src/lib.rs

@@ -553,18 +553,16 @@ where
             ));
         }
 
-        let first_leaf_index = self.next_index();
         let first_changelog_index = (self.changelog.last_index() + 1) % self.changelog.capacity();
         let first_sequence_number = self.sequence_number() + 1;
 
         for (leaf_i, leaf) in leaves.iter().enumerate() {
+            let mut current_index = self.next_index();
+
             self.changelog
-                .push(ChangelogEntry::<HEIGHT>::default_with_index(
-                    first_leaf_index + leaf_i,
-                ));
+                .push(ChangelogEntry::<HEIGHT>::default_with_index(current_index));
             let changelog_index = self.changelog_index();
 
-            let mut current_index = self.next_index();
             let mut current_node = **leaf;
 
             self.changelog[changelog_index].path[0] = **leaf;

merkle-tree/hash-set/src/lib.rs

@@ -12,6 +12,8 @@ use thiserror::Error;
 
 pub mod zero_copy;
 
+pub const ITERATIONS: usize = 20;
+
 #[derive(Debug, Error, PartialEq)]
 pub enum HashSetError {
     #[error("The hash set is full, cannot add any new elements")]
@@ -309,7 +311,7 @@ impl HashSet {
         value: &BigUint,
         current_sequence_number: usize,
     ) -> Result<usize, HashSetError> {
-        let index_bucket = self.find_element_iter(value, current_sequence_number, 0, 20)?;
+        let index_bucket = self.find_element_iter(value, current_sequence_number, 0, ITERATIONS)?;
         let (index, is_new) = match index_bucket {
             Some(index) => index,
             None => {
@@ -347,7 +349,7 @@ impl HashSet {
         value: &BigUint,
         current_sequence_number: Option<usize>,
     ) -> Result<Option<usize>, HashSetError> {
-        for i in 0..self.capacity {
+        for i in 0..ITERATIONS {
             let probe_index = self.probe_index(value, i);
             // PANICS: `probe_index()` ensures the bounds.
             let bucket = self.get_bucket(probe_index).unwrap();
@@ -428,7 +430,7 @@ impl HashSet {
         num_iterations: usize,
     ) -> Result<Option<(usize, bool)>, HashSetError> {
         let mut first_free_element: Option<(usize, bool)> = None;
-        for i in start_iter..num_iterations {
+        for i in start_iter..start_iter + num_iterations {
             let probe_index = self.probe_index(value, i);
             let bucket = self.get_bucket(probe_index).unwrap();
 

merkle-tree/indexed/src/array.rs

@@ -290,12 +290,7 @@ where
             .elements
             .get(usize::from(element.next_index))
             .ok_or(IndexedMerkleTreeError::IndexHigherThanMax)?;
-        let hash = H::hashv(&[
-            bigint_to_be_bytes_array::<32>(&element.value)?.as_ref(),
-            element.next_index.to_be_bytes().as_ref(),
-            bigint_to_be_bytes_array::<32>(&next_element.value)?.as_ref(),
-        ])?;
-        Ok(hash)
+        element.hash::<H>(&next_element.value)
     }
 
     /// Returns an updated low element and a new element, created based on the

merkle-tree/indexed/src/lib.rs

@@ -16,7 +16,7 @@ use light_concurrent_merkle_tree::{
 };
 use light_utils::bigint::bigint_to_be_bytes_array;
 use num_bigint::BigUint;
-use num_traits::{CheckedAdd, CheckedSub, Num, ToBytes, Unsigned};
+use num_traits::{CheckedAdd, CheckedSub, ToBytes, Unsigned};
 
 pub mod array;
 pub mod changelog;
@@ -154,10 +154,8 @@ where
     /// However, it comes with a tradeoff - the space available in the tree
     /// becomes lower by 1.
     pub fn add_highest_element(&mut self) -> Result<(), IndexedMerkleTreeError> {
-        let init_value = BigUint::from_str_radix(HIGHEST_ADDRESS_PLUS_ONE, 10).unwrap();
-
         let mut indexed_array = IndexedArray::<H, I>::default();
-        let element_bundle = indexed_array.append(&init_value)?;
+        let element_bundle = indexed_array.init()?;
         let new_low_leaf = element_bundle
             .new_low_element
             .hash::<H>(&element_bundle.new_element.value)?;