Oops not sure why these never ran locally.

arkworks-rs · Sep 19, 2023 · 204b3b8 · 204b3b8
1 parent 34a7211
commit 204b3b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/ff/src/fields/field_hashers/expander/mod.rs b/ff/src/fields/field_hashers/expander/mod.rs
@@ -29,7 +29,7 @@ impl DST {
             ArrayVec::try_from(long.finalize_fixed().as_ref()).unwrap()
         } else {
             ArrayVec::try_from(dst).unwrap()
-       };
+        };
         DST(array)
     }
 

diff --git a/ff/src/fields/field_hashers/expander/tests.rs b/ff/src/fields/field_hashers/expander/tests.rs
@@ -1,10 +1,12 @@
+
 use libtest_mimic::{run, Arguments, Failed, Trial};
 
 use sha2::{Sha256, Sha384, Sha512};
 use sha3::{Shake128, Shake256};
 use std::{
     fs::{read_dir, File},
     io::BufReader,
+    marker::PhantomData,
 };
 
 use super::{Expander, ExpanderXmd, ExpanderXof};
@@ -99,29 +101,29 @@ fn get_expander(id: ExpID, _dst: &[u8], k: usize) -> Box<dyn Expander> {
     match id {
         ExpID::XMD(h) => match h {
             HashID::SHA256 => Box::new(ExpanderXmd {
-                hasher: Sha256::default(),
+                hasher: PhantomData::<Sha256>,
                 block_size: 64,
                 dst,
             }),
             HashID::SHA384 => Box::new(ExpanderXmd {
-                hasher: Sha384::default(),
+                hasher: PhantomData::<Sha384>,
                 block_size: 128,
                 dst,
             }),
             HashID::SHA512 => Box::new(ExpanderXmd {
-                hasher: Sha512::default(),
+                hasher: PhantomData::<Sha512>,
                 block_size: 128,
                 dst,
             }),
         },
         ExpID::XOF(x) => match x {
             XofID::SHAKE128 => Box::new(ExpanderXof {
-                xofer: Shake128::default(),
+                xofer: PhantomData::<Shake128>,
                 k,
                 dst,
             }),
             XofID::SHAKE256 => Box::new(ExpanderXof {
-                xofer: Shake256::default(),
+                xofer: PhantomData::<Shake256>,
                 k,
                 dst,
             }),