Skip to content

refactor: add members #10

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

Merged
merged 3 commits into from
May 16, 2025
Merged

refactor: add members #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b26dc48
fix: add members
brech1 May 6, 2025
1b24d84
fix: clippy and docs
brech1 May 15, 2025
47e76bc
fix: cargo fmt
brech1 May 16, 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
2 changes: 1 addition & 1 deletion src/baby_jubjub.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//!
//! This is an append to the the `ark-ed-on-bn254` crate to use the EIP-2494 defined Baby Jubjub curve parameters.
//!
//! - https://eips.ethereum.org/EIPS/eip-2494
//! - <https://eips.ethereum.org/EIPS/eip-2494>
//!
//! - Base field: q = 21888242871839275222246405745257275088548364400416034343698204186575808495617
//! - Scalar field: r = 2736030358979909402780800718157159386076813972158567259200215660948447373041
Expand Down
26 changes: 13 additions & 13 deletions src/group.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,14 @@ impl Group {
}

/// Adds a set of members to the group
pub fn add_members(&mut self, members: Vec<Element>) -> Result<(), SemaphoreError> {
for member in &members {
if *member == EMPTY_ELEMENT {
pub fn add_members(&mut self, members: &[Element]) -> Result<(), SemaphoreError> {
for &member in members {
if member == EMPTY_ELEMENT {
return Err(SemaphoreError::EmptyLeaf);
}
}

self.tree.insert_many(&members)?;
self.tree.insert_many(members)?;
Ok(())
}

Expand Down Expand Up @@ -282,7 +282,7 @@ mod tests {
let member1 = [1; 32];
let member2 = [2; 32];

group.add_members(vec![member1, member2]).unwrap();
group.add_members(&[member1, member2]).unwrap();

assert_eq!(group.size(), 2);
}
Expand All @@ -293,7 +293,7 @@ mod tests {
let member1 = [1; 32];
let zero = [0u8; ELEMENT_SIZE];

let result = group.add_members(vec![member1, zero]);
let result = group.add_members(&[member1, zero]);

assert!(result.is_err());
assert_eq!(result, Err(SemaphoreError::EmptyLeaf));
Expand All @@ -305,7 +305,7 @@ mod tests {
let member2 = [2; 32];
let mut group = Group::default();

group.add_members(vec![member1, member2]).unwrap();
group.add_members(&[member1, member2]).unwrap();
let index = group.index_of(member2);

assert_eq!(index, Some(1));
Expand All @@ -317,7 +317,7 @@ mod tests {
let member2 = [2; 32];
let mut group = Group::default();

group.add_members(vec![member1, member2]).unwrap();
group.add_members(&[member1, member2]).unwrap();

group.update_member(0, member1).unwrap();
assert_eq!(group.size(), 2);
Expand All @@ -332,7 +332,7 @@ mod tests {
let member2 = [2; 32];
let mut group = Group::default();

group.add_members(vec![member1, member2]).unwrap();
group.add_members(&[member1, member2]).unwrap();
group.remove_member(0).unwrap();

let result = group.update_member(0, member1);
Expand All @@ -346,7 +346,7 @@ mod tests {
let member2 = [2; 32];
let mut group = Group::default();

group.add_members(vec![member1, member2]).unwrap();
group.add_members(&[member1, member2]).unwrap();
group.remove_member(0).unwrap();

let members = group.members();
Expand All @@ -360,7 +360,7 @@ mod tests {
let member2 = [2; 32];
let mut group = Group::default();

group.add_members(vec![member1, member2]).unwrap();
group.add_members(&[member1, member2]).unwrap();
group.remove_member(0).unwrap();

let result = group.remove_member(0);
Expand All @@ -375,7 +375,7 @@ mod tests {
let member2 = [2; 32];
let mut group = Group::default();

group.add_members(vec![member1, member2]).unwrap();
group.add_members(&[member1, member2]).unwrap();

let proof = group.generate_proof(0).unwrap();
assert_eq!(proof.leaf, member1);
Expand All @@ -387,7 +387,7 @@ mod tests {
let member2 = [2; 32];
let mut group = Group::default();

group.add_members(vec![member1, member2]).unwrap();
group.add_members(&[member1, member2]).unwrap();

let proof_0 = group.generate_proof(0).unwrap();
assert_eq!(Group::verify_proof(&proof_0), true);
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Semaphore Rust Implementation
//!
//! Protocol specifications:
//! - https://github.com/zkspecs/zkspecs/tree/main/specs/3
//! - <https://github.com/zkspecs/zkspecs/tree/main/specs/3>
pub mod baby_jubjub;
pub mod error;
Expand Down
4 changes: 2 additions & 2 deletions tests/group.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ mod group {
fn add_members() {
let mut group = Group::default();
let elements: Vec<Element> = ADDED_MEMBERS.iter().map(|s| str_to_element(s)).collect();
group.add_members(elements).unwrap();
group.add_members(&elements).unwrap();

let root = group.root().unwrap();
assert_eq!(leaf_to_str(&root), ADD_MEMBERS_ROOT_STR);
Expand Down Expand Up @@ -215,7 +215,7 @@ mod group {
.map(|s| str_to_element(s))
.collect();

group.add_members(initial_elements).unwrap();
group.add_members(&initial_elements).unwrap();
group
.add_member(str_to_element("400000000000000000000000000000"))
.unwrap();
Expand Down
Loading