cargo fmt

arkworks-rs · Sep 8, 2023 · 6ec3708 · 6ec3708
1 parent 7705c90
commit 6ec3708
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/ff/src/fields/field_hashers/expander/mod.rs b/ff/src/fields/field_hashers/expander/mod.rs
@@ -3,9 +3,8 @@
 
 use ark_std::vec::Vec;
 
-use digest::{FixedOutputReset, ExtendableOutput, Update};
 use arrayvec::ArrayVec;
-
+use digest::{ExtendableOutput, FixedOutputReset, Update};
 
 pub trait Expander {
     fn expand(&self, msg: &[u8], length: usize) -> Vec<u8>;
@@ -15,23 +14,23 @@ const MAX_DST_LENGTH: usize = 255;
 const LONG_DST_PREFIX: &[u8; 17] = b"H2C-OVERSIZE-DST-";
 
 /// Implements section [5.3.3](https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-hash-to-curve-16#section-5.3.3)
-/// "Using DSTs longer than 255 bytes" of the 
+/// "Using DSTs longer than 255 bytes" of the
 /// [IRTF CFRG hash-to-curve draft #16](https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-hash-to-curve-16#section-5.3.3).
-pub struct DST(arrayvec::ArrayVec<u8,MAX_DST_LENGTH>);
+pub struct DST(arrayvec::ArrayVec<u8, MAX_DST_LENGTH>);
 
 impl DST {
-    pub fn new_xmd<H: FixedOutputReset+Default>(dst: &[u8]) -> DST {
+    pub fn new_xmd<H: FixedOutputReset + Default>(dst: &[u8]) -> DST {
         DST(if dst.len() > MAX_DST_LENGTH {
             let mut long = H::default();
             long.update(&LONG_DST_PREFIX[..]);
             long.update(&dst);
-            ArrayVec::try_from( long.finalize_fixed().as_ref() ).unwrap()
+            ArrayVec::try_from(long.finalize_fixed().as_ref()).unwrap()
         } else {
             ArrayVec::try_from(dst).unwrap()
         })
     }
 
-    pub fn new_xof<H: ExtendableOutput+Default>(dst: &[u8], k: usize) -> DST {
+    pub fn new_xof<H: ExtendableOutput + Default>(dst: &[u8], k: usize) -> DST {
         DST(if dst.len() > MAX_DST_LENGTH {
             let mut long = H::default();
             long.update(&LONG_DST_PREFIX[..]);
@@ -40,7 +39,7 @@ impl DST {
             let mut new_dst = [0u8; MAX_DST_LENGTH];
             let new_dst = &mut new_dst[0..((2 * k + 7) >> 3)];
             long.finalize_xof_into(new_dst);
-            ArrayVec::try_from( &*new_dst ).unwrap()
+            ArrayVec::try_from(&*new_dst).unwrap()
         } else {
             ArrayVec::try_from(dst).unwrap()
         })
@@ -53,7 +52,6 @@ impl DST {
     }
 }
 
-
 pub(super) struct ExpanderXof<H: ExtendableOutput + Clone + Default> {
     pub(super) xofer: H,
     pub(super) dst: Vec<u8>,
@@ -105,12 +103,12 @@ impl<H: FixedOutputReset + Default + Clone> Expander for ExpanderXmd<H> {
         hasher.update(msg);
         hasher.update(&lib_str);
         hasher.update(&[0u8]);
-        dst_prime.update(& mut hasher);
+        dst_prime.update(&mut hasher);
         let b0 = hasher.finalize_fixed_reset();
 
         hasher.update(&b0);
         hasher.update(&[1u8]);
-        dst_prime.update(& mut hasher);
+        dst_prime.update(&mut hasher);
         let mut bi = hasher.finalize_fixed_reset();
 
         let mut uniform_bytes: Vec<u8> = Vec::with_capacity(n);
@@ -121,7 +119,7 @@ impl<H: FixedOutputReset + Default + Clone> Expander for ExpanderXmd<H> {
                 hasher.update(&[*l ^ *r]);
             }
             hasher.update(&[i as u8]);
-            dst_prime.update(& mut hasher);
+            dst_prime.update(&mut hasher);
             bi = hasher.finalize_fixed_reset();
             uniform_bytes.extend_from_slice(&bi);
         }

diff --git a/ff/src/fields/field_hashers/mod.rs b/ff/src/fields/field_hashers/mod.rs
@@ -3,7 +3,7 @@ mod expander;
 use crate::{Field, PrimeField};
 
 use ark_std::vec::Vec;
-use digest::{FixedOutputReset,XofReader};
+use digest::{FixedOutputReset, XofReader};
 use expander::Expander;
 
 use self::expander::ExpanderXmd;
@@ -77,13 +77,13 @@ impl<F: Field, H: FixedOutputReset + Default + Clone, const SEC_PARAM: usize> Ha
                     &uniform_bytes[elm_offset..][..self.len_per_base_elem],
                 )
             };
-            F::from_base_prime_field_elems( (0..m).map( base_prime_field_elem ) ).unwrap()
+            F::from_base_prime_field_elems((0..m).map(base_prime_field_elem)).unwrap()
         };
-        ark_std::array::from_fn::<F,N,_>(cb)
+        ark_std::array::from_fn::<F, N, _>(cb)
     }
 }
 
-pub fn hash_to_field<F: Field,H: XofReader, const SEC_PARAM: usize>(h: &mut H) -> F {
+pub fn hash_to_field<F: Field, H: XofReader, const SEC_PARAM: usize>(h: &mut H) -> F {
     // The final output of `hash_to_field` will be an array of field
     // elements from F::BaseField, each of size `len_per_elem`.
     let len_per_base_elem = get_len_per_elem::<F, SEC_PARAM>();
@@ -97,7 +97,7 @@ pub fn hash_to_field<F: Field,H: XofReader, const SEC_PARAM: usize>(h: &mut H) -
         h.read(alloca);
         F::BasePrimeField::from_be_bytes_mod_order(alloca)
     };
-    F::from_base_prime_field_elems( (0..m).map(base_prime_field_elem) ).unwrap()
+    F::from_base_prime_field_elems((0..m).map(base_prime_field_elem)).unwrap()
 }
 
 /// This function computes the length in bytes that a hash function should output

diff --git a/test-templates/src/h2c/mod.rs b/test-templates/src/h2c/mod.rs
@@ -52,7 +52,7 @@ macro_rules! test_h2c {
 
                 for v in data.vectors.iter() {
                     // first, hash-to-field tests
-                    let got: [$base_prime_field; {  2* $m } ] =
+                    let got: [$base_prime_field; { 2 * $m }] =
                         hasher.hash_to_field(&v.msg.as_bytes());
                     let want: Vec<$base_prime_field> =
                         v.u.iter().map(read_fq_vec).flatten().collect();