fmt + minor tweaks

Author: olegnn

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Install rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: nightly
           override: true
           components: rustfmt
       - name: Ensure Standard Formatting

bbs_plus/src/lib.rs

@@ -24,10 +24,12 @@ pub mod setup;
 pub mod signature;
 
 pub mod prelude {
-    pub use crate::error::BBSPlusError;
-    pub use crate::proof::{PoKOfSignatureG1Proof, PoKOfSignatureG1Protocol};
-    pub use crate::setup::*;
-    pub use crate::signature::{SignatureG1, SignatureG2};
+    pub use crate::{
+        error::BBSPlusError,
+        proof::{PoKOfSignatureG1Proof, PoKOfSignatureG1Protocol},
+        setup::*,
+        signature::{SignatureG1, SignatureG2},
+    };
 }
 
 #[cfg(test)]

bbs_plus/src/proof.rs

@@ -55,10 +55,12 @@
 //!
 //! // See tests for more examples
 //! ```
-use crate::error::BBSPlusError;
-use crate::prelude::PreparedPublicKeyG2;
-use crate::setup::{PreparedSignatureParamsG1, SignatureParamsG1};
-use crate::signature::SignatureG1;
+use crate::{
+    error::BBSPlusError,
+    prelude::PreparedPublicKeyG2,
+    setup::{PreparedSignatureParamsG1, SignatureParamsG1},
+    signature::SignatureG1,
+};
 use ark_ec::{pairing::Pairing, AffineRepr, CurveGroup, VariableBaseMSM};
 use ark_ff::{Field, PrimeField, Zero};
 use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
@@ -71,9 +73,10 @@ use ark_std::{
     vec::Vec,
     One, UniformRand,
 };
-use dock_crypto_utils::extend_some::ExtendSome;
-use dock_crypto_utils::randomized_pairing_check::RandomizedPairingChecker;
-use dock_crypto_utils::{misc::rand, serde_utils::*};
+use dock_crypto_utils::{
+    extend_some::ExtendSome, misc::rand, randomized_pairing_check::RandomizedPairingChecker,
+    serde_utils::*,
+};
 use itertools::multiunzip;
 use schnorr_pok::{error::SchnorrError, SchnorrCommitment, SchnorrResponse};
 use serde::{Deserialize, Serialize};
@@ -527,8 +530,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::setup::KeypairG2;
-    use crate::test_serialization;
+    use crate::{setup::KeypairG2, test_serialization};
     use ark_bls12_381::Bls12_381;
     use ark_serialize::CanonicalDeserialize;
     use ark_std::{

bbs_plus/src/setup.rs

@@ -31,8 +31,10 @@
 
 use crate::error::BBSPlusError;
 use ark_ec::{pairing::Pairing, AffineRepr, CurveGroup, VariableBaseMSM};
-use ark_ff::field_hashers::{DefaultFieldHasher, HashToField};
-use ark_ff::PrimeField;
+use ark_ff::{
+    field_hashers::{DefaultFieldHasher, HashToField},
+    PrimeField,
+};
 use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
 use ark_std::{
     cfg_into_iter, cfg_iter, fmt::Debug, io::Write, rand::RngCore, vec::Vec, UniformRand,
@@ -42,9 +44,10 @@ use schnorr_pok::{error::SchnorrError, impl_proof_of_knowledge_of_discrete_log};
 use zeroize::Zeroize;
 
 use core::iter::once;
-use dock_crypto_utils::hashing_utils::projective_group_elem_from_try_and_incr;
-use dock_crypto_utils::serde_utils::*;
-use dock_crypto_utils::{concat_slices, iter::*, misc::is_lt};
+use dock_crypto_utils::{
+    concat_slices, hashing_utils::projective_group_elem_from_try_and_incr, iter::*, misc::is_lt,
+    serde_utils::*, try_iter::CheckLeft,
+};
 use itertools::process_results;
 
 #[cfg(feature = "parallel")]

bbs_plus/src/signature.rs

@@ -308,15 +308,16 @@ impl_signature_alg!(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::setup::{KeypairG1, KeypairG2};
-    use crate::test_serialization;
+    use crate::{
+        setup::{KeypairG1, KeypairG2},
+        test_serialization,
+    };
     use ark_bls12_381::{Bls12_381, G1Affine, G2Affine};
     use ark_std::{
         rand::{rngs::StdRng, SeedableRng},
         UniformRand,
     };
-    use std::collections::HashSet;
-    use std::time::Instant;
+    use std::{collections::HashSet, time::Instant};
 
     type Fr = <Bls12_381 as Pairing>::ScalarField;
 

benches/benches/accum_witness_updates.rs

@@ -5,12 +5,13 @@ use ark_std::{
     UniformRand,
 };
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use std::collections::HashSet;
-use std::time::Instant;
+use std::{collections::HashSet, time::Instant};
 use test_utils::accumulators::{setup_positive_accum, setup_universal_accum};
-use vb_accumulator::batch_utils::Omega;
-use vb_accumulator::positive::Accumulator;
-use vb_accumulator::witness::{MembershipWitness, NonMembershipWitness};
+use vb_accumulator::{
+    batch_utils::Omega,
+    positive::Accumulator,
+    witness::{MembershipWitness, NonMembershipWitness},
+};
 
 type Fr = <Bls12_381 as Pairing>::ScalarField;
 

benches/benches/bbs_plus_proof.rs

@@ -1,13 +1,15 @@
 use ark_bls12_381::Bls12_381;
 use ark_ec::pairing::Pairing;
-use ark_std::collections::{BTreeMap, BTreeSet};
 use ark_std::{
+    collections::{BTreeMap, BTreeSet},
     rand::{rngs::StdRng, SeedableRng},
     UniformRand,
 };
-use bbs_plus::proof::{MessageOrBlinding, PoKOfSignatureG1Protocol};
-use bbs_plus::setup::{KeypairG2, SignatureParamsG1};
-use bbs_plus::signature::SignatureG1;
+use bbs_plus::{
+    proof::{MessageOrBlinding, PoKOfSignatureG1Protocol},
+    setup::{KeypairG2, SignatureParamsG1},
+    signature::SignatureG1,
+};
 use benches::setup_bbs_plus;
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
 

benches/benches/bbs_plus_signature.rs

@@ -4,8 +4,10 @@ use ark_std::{
     rand::{rngs::StdRng, SeedableRng},
     UniformRand,
 };
-use bbs_plus::setup::{KeypairG1, KeypairG2, SignatureParamsG1, SignatureParamsG2};
-use bbs_plus::signature::{SignatureG1, SignatureG2};
+use bbs_plus::{
+    setup::{KeypairG1, KeypairG2, SignatureParamsG1, SignatureParamsG2},
+    signature::{SignatureG1, SignatureG2},
+};
 use benches::setup_bbs_plus;
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
 

benches/benches/ps_proof.rs

@@ -1,16 +1,15 @@
 use ark_bls12_381::Bls12_381;
 use ark_ec::pairing::Pairing;
-use ark_std::collections::{BTreeMap, BTreeSet};
 use ark_std::{
+    collections::{BTreeMap, BTreeSet},
     rand::{rngs::StdRng, SeedableRng},
     UniformRand,
 };
 use benches::setup_ps;
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
 use itertools::{EitherOrBoth, Itertools};
 
-use coconut_crypto::signature::Signature;
-use coconut_crypto::{setup::*, SignaturePoKGenerator};
+use coconut_crypto::{setup::*, signature::Signature, SignaturePoKGenerator};
 
 type Fr = <Bls12_381 as Pairing>::ScalarField;
 

benches/benches/ps_signature.rs

@@ -5,8 +5,7 @@ use ark_std::{
     UniformRand,
 };
 use benches::setup_ps;
-use coconut_crypto::setup::*;
-use coconut_crypto::Signature;
+use coconut_crypto::{setup::*, Signature};
 use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion};
 
 type Fr = <Bls12_381 as Pairing>::ScalarField;