Skip to content

Add current_zero value when no leaves are provided when calling new() #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add current_zero value when no leaves are provided when calling new() #66

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76d74e4
fix: add curr zero value when new without leaves
0xjei Mar 27, 2025
2b749d1
test: add missing tests for imt new fn
0xjei Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 76 additions & 17 deletions crates/imt/src/imt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,28 @@ impl IMT {
current_zero = (imt.hash)(vec![current_zero; arity]);
}

imt.nodes[0] = leaves;

for level in 0..depth {
for index in 0..((imt.nodes[level].len() as f64 / arity as f64).ceil() as usize) {
let position = index * arity;
let children: Vec<_> = (0..arity)
.map(|i| {
imt.nodes[level]
.get(position + i)
.cloned()
.unwrap_or_else(|| imt.zeroes[level].clone())
})
.collect();

if let Some(next_level) = imt.nodes.get_mut(level + 1) {
next_level.push((imt.hash)(children));
imt.nodes[0] = leaves.clone();

if leaves.len() > 0 {
for level in 0..depth {
for index in 0..((imt.nodes[level].len() as f64 / arity as f64).ceil() as usize) {
let position = index * arity;
let children: Vec<_> = (0..arity)
.map(|i| {
imt.nodes[level]
.get(position + i)
.cloned()
.unwrap_or_else(|| imt.zeroes[level].clone())
})
.collect();

if let Some(next_level) = imt.nodes.get_mut(level + 1) {
next_level.push((imt.hash)(children));
}
}
}
} else {
imt.nodes[imt.depth] = vec![current_zero];
}

Ok(imt)
Expand Down Expand Up @@ -194,18 +198,73 @@ impl IMT {

#[cfg(test)]
mod tests {
use std::str::FromStr;

use super::*;

fn simple_hash_function(nodes: Vec<String>) -> String {
nodes.join(",")
}

#[test]
fn test_new_imt() {
fn test_new_imt_without_leaves() {
let hash: IMTHashFunction = simple_hash_function;
let imt = IMT::new(hash, 3, "zero".to_string(), 2, vec![]);

assert!(imt.is_ok());
assert_eq!(imt.as_ref().unwrap().nodes().get(0), Some(&vec![]));
assert_eq!(imt.as_ref().unwrap().nodes().get(1), Some(&vec![]));
assert_eq!(imt.as_ref().unwrap().nodes().get(2), Some(&vec![]));
assert_eq!(
imt.as_ref().unwrap().nodes().get(3),
Some(&vec!["zero,zero,zero,zero,zero,zero,zero,zero".to_string()])
);
}

#[test]
fn test_new_imt_with_leaves() {
let hash: IMTHashFunction = simple_hash_function;
let imt = IMT::new(
hash,
3,
"zero".to_string(),
2,
vec![
String::from_str("1").unwrap(),
String::from_str("2").unwrap(),
String::from_str("3").unwrap(),
String::from_str("4").unwrap(),
String::from_str("5").unwrap(),
],
);

assert!(imt.is_ok());
assert_eq!(
imt.as_ref().unwrap().nodes().get(0),
Some(&vec![
"1".to_string(),
"2".to_string(),
"3".to_string(),
"4".to_string(),
"5".to_string()
])
);
assert_eq!(
imt.as_ref().unwrap().nodes().get(1),
Some(&vec![
"1,2".to_string(),
"3,4".to_string(),
"5,zero".to_string()
])
);
assert_eq!(
imt.as_ref().unwrap().nodes().get(2),
Some(&vec!["1,2,3,4".to_string(), "5,zero,zero,zero".to_string()])
);
assert_eq!(
imt.as_ref().unwrap().nodes().get(3),
Some(&vec!["1,2,3,4,5,zero,zero,zero".to_string()])
);
}

#[test]
Expand Down