Skip to content

Commit 0d2c7e4

Browse files
authored
Merge pull request #10 from brech1/fix/add-members
refactor: add members
2 parents 47bb852 + 47e76bc commit 0d2c7e4

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

src/baby_jubjub.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//!
33
//! This is an append to the the `ark-ed-on-bn254` crate to use the EIP-2494 defined Baby Jubjub curve parameters.
44
//!
5-
//! - https://eips.ethereum.org/EIPS/eip-2494
5+
//! - <https://eips.ethereum.org/EIPS/eip-2494>
66
//!
77
//! - Base field: q = 21888242871839275222246405745257275088548364400416034343698204186575808495617
88
//! - Scalar field: r = 2736030358979909402780800718157159386076813972158567259200215660948447373041

src/group.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ impl Group {
108108
}
109109

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

118-
self.tree.insert_many(&members)?;
118+
self.tree.insert_many(members)?;
119119
Ok(())
120120
}
121121

@@ -282,7 +282,7 @@ mod tests {
282282
let member1 = [1; 32];
283283
let member2 = [2; 32];
284284

285-
group.add_members(vec![member1, member2]).unwrap();
285+
group.add_members(&[member1, member2]).unwrap();
286286

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

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

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

308-
group.add_members(vec![member1, member2]).unwrap();
308+
group.add_members(&[member1, member2]).unwrap();
309309
let index = group.index_of(member2);
310310

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

320-
group.add_members(vec![member1, member2]).unwrap();
320+
group.add_members(&[member1, member2]).unwrap();
321321

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

335-
group.add_members(vec![member1, member2]).unwrap();
335+
group.add_members(&[member1, member2]).unwrap();
336336
group.remove_member(0).unwrap();
337337

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

349-
group.add_members(vec![member1, member2]).unwrap();
349+
group.add_members(&[member1, member2]).unwrap();
350350
group.remove_member(0).unwrap();
351351

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

363-
group.add_members(vec![member1, member2]).unwrap();
363+
group.add_members(&[member1, member2]).unwrap();
364364
group.remove_member(0).unwrap();
365365

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

378-
group.add_members(vec![member1, member2]).unwrap();
378+
group.add_members(&[member1, member2]).unwrap();
379379

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

390-
group.add_members(vec![member1, member2]).unwrap();
390+
group.add_members(&[member1, member2]).unwrap();
391391

392392
let proof_0 = group.generate_proof(0).unwrap();
393393
assert_eq!(Group::verify_proof(&proof_0), true);

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Semaphore Rust Implementation
22
//!
33
//! Protocol specifications:
4-
//! - https://github.com/zkspecs/zkspecs/tree/main/specs/3
4+
//! - <https://github.com/zkspecs/zkspecs/tree/main/specs/3>
55
66
pub mod baby_jubjub;
77
pub mod error;

tests/group.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ mod group {
123123
fn add_members() {
124124
let mut group = Group::default();
125125
let elements: Vec<Element> = ADDED_MEMBERS.iter().map(|s| str_to_element(s)).collect();
126-
group.add_members(elements).unwrap();
126+
group.add_members(&elements).unwrap();
127127

128128
let root = group.root().unwrap();
129129
assert_eq!(leaf_to_str(&root), ADD_MEMBERS_ROOT_STR);
@@ -215,7 +215,7 @@ mod group {
215215
.map(|s| str_to_element(s))
216216
.collect();
217217

218-
group.add_members(initial_elements).unwrap();
218+
group.add_members(&initial_elements).unwrap();
219219
group
220220
.add_member(str_to_element("400000000000000000000000000000"))
221221
.unwrap();

0 commit comments

Comments
 (0)