imports organized

Author: curiecrypt

mithril-stm/src/membership_commitment/merkle_tree/commitment.rs

@@ -3,9 +3,7 @@ use blake2::digest::{Digest, FixedOutput};
 use serde::{Deserialize, Serialize};
 use std::marker::PhantomData;
 
-use crate::membership_commitment::merkle_tree::{
-    MerkleBatchPath, MerklePath, MerkleTreeLeaf, parent, sibling,
-};
+use super::{MerkleBatchPath, MerklePath, MerkleTreeLeaf, parent, sibling};
 use crate::{MerkleTreeError, StmResult};
 
 /// `MerkleTree` commitment.

mithril-stm/src/membership_commitment/merkle_tree/leaf.rs

@@ -2,9 +2,9 @@ use std::cmp::Ordering;
 
 use serde::{Deserialize, Serialize};
 
-use crate::signature_scheme::BlsVerificationKey;
-use crate::{MerkleTreeError, StmResult};
-use crate::{Stake, VerificationKey};
+use crate::{
+    MerkleTreeError, Stake, StmResult, VerificationKey, signature_scheme::BlsVerificationKey,
+};
 
 /// The values that are committed in the Merkle Tree.
 /// Namely, a verified `VerificationKey` and its corresponding stake.

mithril-stm/src/membership_commitment/merkle_tree/tree.rs

@@ -1,9 +1,8 @@
-use std::marker::PhantomData;
-
 use blake2::digest::{Digest, FixedOutput};
 use serde::{Deserialize, Serialize};
+use std::marker::PhantomData;
 
-use crate::membership_commitment::merkle_tree::{
+use super::{
     MerkleBatchPath, MerklePath, MerkleTreeBatchCommitment, MerkleTreeCommitment, MerkleTreeLeaf,
     left_child, parent, right_child, sibling,
 };
@@ -268,13 +267,14 @@ impl<D: Digest + FixedOutput> MerkleTree<D> {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use crate::signature_scheme::BlsVerificationKey;
     use blake2::{Blake2b, digest::consts::U32};
-    use proptest::collection::vec;
-    use proptest::prelude::*;
+    use proptest::{collection::vec, prelude::*};
     use rand::{rng, seq::IteratorRandom};
 
+    use crate::signature_scheme::BlsVerificationKey;
+
+    use super::*;
+
     fn pow2_plus1(h: usize) -> usize {
         1 + 2_usize.pow(h as u32)
     }

mithril-stm/src/proof_system/concatenation.rs

@@ -1,13 +1,12 @@
 use anyhow::Context;
 use blake2::digest::{Digest, FixedOutput};
-
 use serde::{Deserialize, Serialize};
 
-use crate::membership_commitment::MerkleBatchPath;
-use crate::signature_scheme::{BlsSignature, BlsVerificationKey};
 use crate::{
     AggregateSignatureError, AggregateVerificationKey, BasicVerifier, Clerk, Parameters,
     RegisteredParty, SingleSignature, SingleSignatureWithRegisteredParty, StmResult,
+    membership_commitment::MerkleBatchPath,
+    signature_scheme::{BlsSignature, BlsVerificationKey},
 };
 
 /// `ConcatenationProof` uses the "concatenation" proving system (as described in Section 4.3 of the original paper.)

mithril-stm/src/protocol/aggregate_signature/aggregate_key.rs

@@ -1,8 +1,10 @@
 use blake2::digest::{Digest, FixedOutput};
 use serde::{Deserialize, Serialize};
 
-use crate::membership_commitment::{MerkleBatchPath, MerkleTreeBatchCommitment};
-use crate::{ClosedKeyRegistration, Stake};
+use crate::{
+    ClosedKeyRegistration, Stake,
+    membership_commitment::{MerkleBatchPath, MerkleTreeBatchCommitment},
+};
 
 /// Stm aggregate key (batch compatible), which contains the merkle tree commitment and the total stake of the system.
 /// Batch Compat Merkle tree commitment includes the number of leaves in the tree in order to obtain batch path.

mithril-stm/src/protocol/aggregate_signature/basic_verifier.rs

@@ -1,11 +1,11 @@
 use anyhow::{Context, anyhow};
 use std::collections::{BTreeMap, HashMap, HashSet};
 
-use crate::membership_commitment::MerkleTreeLeaf;
-use crate::signature_scheme::{BlsSignature, BlsVerificationKey};
 use crate::{
     AggregationError, Index, Parameters, RegisteredParty, SingleSignature,
     SingleSignatureWithRegisteredParty, Stake, StmResult,
+    membership_commitment::MerkleTreeLeaf,
+    signature_scheme::{BlsSignature, BlsVerificationKey},
 };
 
 /// Full node verifier including the list of eligible signers and the total stake of the system.

mithril-stm/src/protocol/aggregate_signature/clerk.rs

@@ -1,8 +1,3 @@
-use crate::{
-    AggregateSignature, AggregateSignatureType, AggregateVerificationKey, ClosedKeyRegistration,
-    Index, Parameters, Signer, SingleSignature, Stake, StmResult, VerificationKey,
-    proof_system::ConcatenationProof,
-};
 use anyhow::Context;
 use blake2::digest::{Digest, FixedOutput};
 
@@ -12,6 +7,12 @@ use anyhow::anyhow;
 #[cfg(feature = "future_proof_system")]
 use crate::AggregationError;
 
+use super::{AggregateSignature, AggregateSignatureType, AggregateVerificationKey};
+use crate::{
+    ClosedKeyRegistration, Index, Parameters, Signer, SingleSignature, Stake, StmResult,
+    VerificationKey, proof_system::ConcatenationProof,
+};
+
 /// `Clerk` can verify and aggregate `SingleSignature`s and verify `AggregateSignature`s.
 /// Clerks can only be generated with the registration closed.
 /// This avoids that a Merkle Tree is computed before all parties have registered.

mithril-stm/src/protocol/aggregate_signature/mod.rs

@@ -10,8 +10,6 @@ pub use signature::*;
 
 #[cfg(test)]
 mod tests {
-    use std::collections::{HashMap, HashSet};
-
     use blake2::{Blake2b, digest::consts::U32};
     use proptest::{
         collection::{hash_map, vec},
@@ -20,10 +18,11 @@ mod tests {
     };
     use rand_chacha::ChaCha20Rng;
     use rand_core::{RngCore, SeedableRng};
+    use std::collections::{HashMap, HashSet};
 
+    use super::{AggregateSignature, AggregateSignatureType, BasicVerifier, Clerk};
     use crate::{
-        AggregateSignature, AggregateSignatureType, AggregationError, BasicVerifier, Clerk,
-        Initializer, KeyRegistration, Parameters, Signer, SingleSignature,
+        AggregationError, Initializer, KeyRegistration, Parameters, Signer, SingleSignature,
         SingleSignatureWithRegisteredParty, Stake, StmResult,
         membership_commitment::MerkleBatchPath, signature_scheme::BlsVerificationKey,
     };

mithril-stm/src/protocol/aggregate_signature/signature.rs

@@ -1,14 +1,12 @@
-use std::collections::HashMap;
-use std::fmt::Display;
-use std::hash::Hash;
+use std::{collections::HashMap, fmt::Display, hash::Hash};
 
 use anyhow::anyhow;
 use blake2::digest::{Digest, FixedOutput};
 use serde::{Deserialize, Serialize};
 
-use crate::membership_commitment::MerkleBatchPath;
+use super::AggregateVerificationKey;
 use crate::{
-    AggregateSignatureError, AggregateVerificationKey, Parameters, StmResult,
+    AggregateSignatureError, Parameters, StmResult, membership_commitment::MerkleBatchPath,
     proof_system::ConcatenationProof,
 };
 
@@ -211,10 +209,10 @@ mod tests {
         use rand_chacha::ChaCha20Rng;
         use rand_core::SeedableRng;
 
-        use crate::signature_scheme::{BlsSigningKey, BlsVerificationKeyProofOfPossession};
+        use super::{AggregateSignature, AggregateSignatureType};
         use crate::{
-            AggregateSignature, AggregateSignatureType, Clerk, ClosedKeyRegistration,
-            KeyRegistration, Parameters, Signer,
+            Clerk, ClosedKeyRegistration, KeyRegistration, Parameters, Signer,
+            signature_scheme::{BlsSigningKey, BlsVerificationKeyProofOfPossession},
         };
 
         type D = Blake2b<U32>;

mithril-stm/src/protocol/error.rs

@@ -2,10 +2,10 @@
 use anyhow::anyhow;
 use blst::BLST_ERROR;
 
-use crate::signature_scheme::{
-    BlsSignature, BlsVerificationKey, BlsVerificationKeyProofOfPossession,
+use crate::{
+    AggregateSignatureType, StmResult,
+    signature_scheme::{BlsSignature, BlsVerificationKey, BlsVerificationKeyProofOfPossession},
 };
-use crate::{AggregateSignatureType, StmResult};
 
 /// Error types for multi signatures.
 #[derive(Debug, thiserror::Error, Eq, PartialEq)]