rust fmt

argumentcomputer · Oct 13, 2020 · ff1753e · ff1753e
1 parent 33a68c8
commit ff1753e
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 19 deletions.
diff --git a/benches/hash.rs b/benches/hash.rs
@@ -1,9 +1,9 @@
+use bellperson::bls::{Bls12, Fr};
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 use ff::PrimeField;
 use generic_array::typenum;
 use neptune::poseidon::{HashMode, PoseidonConstants};
 use neptune::*;
-use bellperson::bls::{Bls12, Fr};
 use rand::rngs::OsRng;
 use rand::seq::SliceRandom;
 use sha2::{Digest, Sha256, Sha512};

diff --git a/benches/synthesis.rs b/benches/synthesis.rs
@@ -1,4 +1,5 @@
 use crate::poseidon::{Arity, PoseidonConstants};
+use bellperson::bls::{Bls12, Fr};
 use bellperson::gadgets::num::AllocatedNum;
 use bellperson::util_cs::bench_cs::BenchCS;
 use bellperson::{Circuit, ConstraintSystem, SynthesisError};
@@ -7,7 +8,6 @@ use ff::Field;
 use generic_array::typenum;
 use neptune::circuit::poseidon_hash;
 use neptune::*;
-use bellperson::bls::{Bls12, Fr};
 use rand::thread_rng;
 use std::marker::PhantomData;
 

diff --git a/src/batch_hasher.rs b/src/batch_hasher.rs
@@ -3,8 +3,8 @@ use crate::cl;
 use crate::error::Error;
 use crate::poseidon::SimplePoseidonBatchHasher;
 use crate::{Arity, BatchHasher, Strength, DEFAULT_STRENGTH};
-use generic_array::GenericArray;
 use bellperson::bls::Fr;
+use generic_array::GenericArray;
 use std::marker::PhantomData;
 
 #[derive(Clone, Copy, Debug)]

diff --git a/src/circuit.rs b/src/circuit.rs
@@ -587,10 +587,10 @@ mod tests {
     use super::*;
     use crate::poseidon::HashMode;
     use crate::{scalar_from_u64, Poseidon, Strength};
+    use bellperson::bls::{Bls12, Fr};
     use bellperson::util_cs::test_cs::TestConstraintSystem;
     use bellperson::ConstraintSystem;
     use generic_array::typenum;
-    use bellperson::bls::{Bls12, Fr};
     use rand::SeedableRng;
     use rand_xorshift::XorShiftRng;
 

diff --git a/src/column_tree_builder.rs b/src/column_tree_builder.rs
@@ -5,9 +5,9 @@ use crate::error::Error;
 use crate::poseidon::{Poseidon, PoseidonConstants};
 use crate::tree_builder::{TreeBuilder, TreeBuilderTrait};
 use crate::{Arity, BatchHasher};
+use bellperson::bls::{Bls12, Fr};
 use ff::Field;
 use generic_array::GenericArray;
-use bellperson::bls::{Bls12, Fr};
 
 pub trait ColumnTreeBuilderTrait<ColumnArity, TreeArity>
 where
@@ -151,10 +151,10 @@ mod tests {
     use super::*;
     use crate::poseidon::Poseidon;
     use crate::BatchHasher;
+    use bellperson::bls::Fr;
     use ff::Field;
     use generic_array::sequence::GenericSequence;
     use generic_array::typenum::{U11, U8};
-    use bellperson::bls::Fr;
 
     #[test]
     fn test_column_tree_builder() {

diff --git a/src/gpu.rs b/src/gpu.rs
@@ -3,9 +3,9 @@ use crate::cl;
 use crate::error::Error;
 use crate::poseidon::PoseidonConstants;
 use crate::{Arity, BatchHasher, Strength, DEFAULT_STRENGTH};
+use bellperson::bls::{Bls12, Fr, FrRepr};
 use ff::{PrimeField, PrimeFieldDecodingError};
 use generic_array::{typenum, ArrayLength, GenericArray};
-use bellperson::bls::{Bls12, Fr, FrRepr};
 use std::collections::HashMap;
 use std::marker::PhantomData;
 use std::sync::{Arc, Mutex};

diff --git a/src/lib.rs b/src/lib.rs
@@ -5,11 +5,11 @@ extern crate lazy_static;
 
 pub use crate::poseidon::{Arity, Poseidon};
 use crate::round_constants::generate_constants;
+pub use bellperson::bls::Fr as Scalar;
+use bellperson::bls::FrRepr;
 pub use error::Error;
 use ff::{Field, PrimeField, ScalarEngine};
 use generic_array::GenericArray;
-pub use bellperson::bls::Fr as Scalar;
-use bellperson::bls::FrRepr;
 
 /// Poseidon circuit
 pub mod circuit;

diff --git a/src/mds.rs b/src/mds.rs
@@ -211,8 +211,8 @@ fn make_v_w<E: ScalarEngine>(m: &Matrix<Scalar<E>>) -> (Vec<Scalar<E>>, Vec<Scal
 mod tests {
     use super::*;
     use crate::*;
-    use matrix::left_apply_matrix;
     use bellperson::bls::{Bls12, Fr};
+    use matrix::left_apply_matrix;
     use rand::SeedableRng;
     use rand_xorshift::XorShiftRng;
 

diff --git a/src/poseidon.rs b/src/poseidon.rs
@@ -4,9 +4,9 @@ use crate::poseidon_alt::{hash_correct, hash_optimized_dynamic};
 use crate::preprocessing::compress_round_constants;
 use crate::{matrix, quintic_s_box, BatchHasher, Strength, DEFAULT_STRENGTH};
 use crate::{round_constants, round_numbers, scalar_from_u64, Error};
+use bellperson::bls::{Bls12, Fr};
 use ff::{Field, PrimeField, ScalarEngine};
 use generic_array::{sequence::GenericSequence, typenum, ArrayLength, GenericArray};
-use bellperson::bls::{Fr, Bls12};
 use std::marker::PhantomData;
 use typenum::marker_traits::Unsigned;
 use typenum::*;
@@ -493,10 +493,7 @@ impl<A> BatchHasher<A> for SimplePoseidonBatchHasher<A>
 where
     A: Arity<Fr>,
 {
-    fn hash(
-        &mut self,
-        preimages: &[GenericArray<Fr, A>],
-    ) -> Result<Vec<Fr>, Error> {
+    fn hash(&mut self, preimages: &[GenericArray<Fr, A>]) -> Result<Vec<Fr>, Error> {
         Ok(preimages
             .iter()
             .map(|preimage| Poseidon::new_with_preimage(&preimage, &self.constants).hash())
@@ -512,9 +509,9 @@ where
 mod tests {
     use super::*;
     use crate::*;
+    use bellperson::bls::{Bls12, Fr};
     use ff::Field;
     use generic_array::typenum;
-    use bellperson::bls::{Bls12, Fr};
 
     #[test]
     fn reset() {

diff --git a/src/round_constants.rs b/src/round_constants.rs
@@ -1,6 +1,6 @@
 pub use crate::Error;
-use ff::{PrimeField, PrimeFieldDecodingError, PrimeFieldRepr, ScalarEngine};
 pub use bellperson::bls::Fr as Scalar;
+use ff::{PrimeField, PrimeFieldDecodingError, PrimeFieldRepr, ScalarEngine};
 
 /// From the paper ():
 /// The round constants are generated using the Grain LFSR [23] in a self-shrinking

diff --git a/src/tree_builder.rs b/src/tree_builder.rs
@@ -4,9 +4,9 @@ use crate::cl::GPUSelector;
 use crate::error::Error;
 use crate::poseidon::{Poseidon, PoseidonConstants};
 use crate::{Arity, BatchHasher};
+use bellperson::bls::{Bls12, Fr};
 use ff::Field;
 use generic_array::GenericArray;
-use bellperson::bls::{Bls12, Fr};
 
 pub trait TreeBuilderTrait<TreeArity>
 where
@@ -250,9 +250,9 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
+    use bellperson::bls::Fr;
     use ff::Field;
     use generic_array::typenum::U8;
-    use bellperson::bls::Fr;
 
     #[test]
     fn test_tree_builder() {