fmt

worldcoin · Apr 10, 2024 · 2a68fc5 · 2a68fc5
1 parent f00c51b
commit 2a68fc5
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 23 deletions.
diff --git a/benches/cascading_merkle_tree.rs b/benches/cascading_merkle_tree.rs
@@ -1,10 +1,9 @@
 use criterion::{criterion_group, criterion_main, BatchSize, BenchmarkId, Criterion};
 #[allow(clippy::wildcard_imports)]
 use semaphore::cascading_merkle_tree::*;
-use semaphore::generic_storage::MmapVec;
-use semaphore::merkle_tree::Hasher;
-use semaphore::poseidon_tree::PoseidonHash;
-use semaphore::Field;
+use semaphore::{
+    generic_storage::MmapVec, merkle_tree::Hasher, poseidon_tree::PoseidonHash, Field,
+};
 
 criterion_main!(cascading_merkle_tree);
 criterion_group!(
@@ -126,12 +125,13 @@ fn bench_cascading_create_dense_mmap_tree(criterion: &mut Criterion) {
                 bencher.iter(|| {
                     let storage: MmapVec<<PoseidonHash as Hasher>::Hash> =
                         unsafe { MmapVec::open_create("./testfile").unwrap() };
-                    let _tree: CascadingMerkleTree<PoseidonHash, _> = CascadingMerkleTree::from_storage_with_leaves(
-                        storage,
-                        value.depth,
-                        &value.empty_value,
-                        &value.initial_values,
-                    );
+                    let _tree: CascadingMerkleTree<PoseidonHash, _> =
+                        CascadingMerkleTree::from_storage_with_leaves(
+                            storage,
+                            value.depth,
+                            &value.empty_value,
+                            &value.initial_values,
+                        );
                     let _root = _tree.root();
                 });
             },
@@ -153,12 +153,13 @@ fn bench_cascading_restore_dense_mmap_tree(criterion: &mut Criterion) {
     // file should be saved
     (0..3).zip(&tree_values).for_each(|(id, value)| {
         let storage: MmapVec<_> = unsafe { MmapVec::open_create("./testfile").unwrap() };
-        let _tree: CascadingMerkleTree<PoseidonHash, _> = CascadingMerkleTree::from_storage_with_leaves(
-            storage,
-            value.depth,
-            &value.empty_value,
-            &value.initial_values,
-        );
+        let _tree: CascadingMerkleTree<PoseidonHash, _> =
+            CascadingMerkleTree::from_storage_with_leaves(
+                storage,
+                value.depth,
+                &value.empty_value,
+                &value.initial_values,
+            );
         let _root = _tree.root();
     });
 
@@ -173,7 +174,8 @@ fn bench_cascading_restore_dense_mmap_tree(criterion: &mut Criterion) {
                     let storage =
                         unsafe { MmapVec::open_create(format!("./testfile{}", id)).unwrap() };
                     let _tree: CascadingMerkleTree<PoseidonHash, _> =
-                        CascadingMerkleTree::from_storage(storage, value.depth, &value.empty_value).unwrap();
+                        CascadingMerkleTree::from_storage(storage, value.depth, &value.empty_value)
+                            .unwrap();
                     let _root = _tree.root();
                 });
             },

diff --git a/examples/abort_test/main.rs b/examples/abort_test/main.rs
@@ -26,7 +26,9 @@ fn main() -> Result<()> {
     if args.len() == 1 {
         println!("initializing\n");
         let leaves = vec![1; 1_000_000];
-        let _ = CascadingMerkleTree::<TestHasher, _>::from_storage_with_leaves(mmap_vec, 30, &1, &leaves);
+        let _ = CascadingMerkleTree::<TestHasher, _>::from_storage_with_leaves(
+            mmap_vec, 30, &1, &leaves,
+        );
         for i in 0..100 {
             println!("running interation {}", i);
             let output = std::process::Command::new("target/debug/examples/abort_test")

diff --git a/src/cascading_merkle_tree.rs b/src/cascading_merkle_tree.rs
@@ -4,8 +4,10 @@ use color_eyre::eyre::{bail, ensure, Result};
 use itertools::Itertools;
 use rayon::prelude::*;
 
-use crate::generic_storage::GenericStorage;
-use crate::merkle_tree::{Branch, Hasher, Proof};
+use crate::{
+    generic_storage::GenericStorage,
+    merkle_tree::{Branch, Hasher, Proof},
+};
 
 mod storage_ops;
 

diff --git a/src/generic_storage/mmap_vec.rs b/src/generic_storage/mmap_vec.rs
@@ -1,6 +1,8 @@
-use std::fs::{File, OpenOptions};
-use std::ops::{Deref, DerefMut};
-use std::path::Path;
+use std::{
+    fs::{File, OpenOptions},
+    ops::{Deref, DerefMut},
+    path::Path,
+};
 
 use bytemuck::Pod;
 use color_eyre::eyre::bail;