finished moving error to submodule and fixed import order and typos

Author: damrobi

mithril-stm/Cargo.toml

@@ -72,7 +72,7 @@ required-features = ["benchmark-internals"]
 [[bench]]
 name = "schnorr_sig"
 harness = false
-required-features = ["future_snark"]
+required-features = ["future_snark", "benchmark-internals"]
 
 [[bench]]
 name = "stm"

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

@@ -3,9 +3,10 @@ use blake2::digest::{Digest, FixedOutput};
 use serde::{Deserialize, Serialize};
 use std::marker::PhantomData;
 
-use super::{MerkleBatchPath, MerklePath, MerkleTreeError, MerkleTreeLeaf, parent, sibling};
 use crate::StmResult;
 
+use super::{MerkleBatchPath, MerklePath, MerkleTreeError, MerkleTreeLeaf, parent, sibling};
+
 /// `MerkleTree` commitment.
 /// This structure differs from `MerkleTree` in that it does not contain all elements, which are not always necessary.
 /// Instead, it only contains the root of the tree.

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

@@ -2,10 +2,10 @@ use std::cmp::Ordering;
 
 use serde::{Deserialize, Serialize};
 
-use super::MerkleTreeError;
-
 use crate::{Stake, StmResult, VerificationKey, signature_scheme::BlsVerificationKey};
 
+use super::MerkleTreeError;
+
 /// The values that are committed in the Merkle Tree.
 /// Namely, a verified `VerificationKey` and its corresponding stake.
 #[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize, Hash)]

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

@@ -2,9 +2,10 @@ use blake2::digest::{Digest, FixedOutput};
 use serde::{Deserialize, Serialize};
 use std::marker::PhantomData;
 
-use super::MerkleTreeError;
 use crate::StmResult;
 
+use super::MerkleTreeError;
+
 /// Path of hashes from root to leaf in a Merkle Tree.
 /// Contains all hashes on the path, and the index of the leaf.
 /// Used to verify that signatures come from eligible signers.

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

@@ -2,11 +2,12 @@ use blake2::digest::{Digest, FixedOutput};
 use serde::{Deserialize, Serialize};
 use std::marker::PhantomData;
 
+use crate::StmResult;
+
 use super::{
     MerkleBatchPath, MerklePath, MerkleTreeBatchCommitment, MerkleTreeCommitment, MerkleTreeError,
     MerkleTreeLeaf, left_child, parent, right_child, sibling,
 };
-use crate::StmResult;
 
 /// Tree of hashes, providing a commitment of data and its ordering.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]

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

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

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

@@ -7,12 +7,13 @@ use anyhow::anyhow;
 #[cfg(feature = "future_snark")]
 use super::AggregationError;
 
-use super::{AggregateSignature, AggregateSignatureType, AggregateVerificationKey};
 use crate::{
     ClosedKeyRegistration, Index, Parameters, Signer, SingleSignature, Stake, StmResult,
     VerificationKey, proof_system::ConcatenationProof,
 };
 
+use super::{AggregateSignature, AggregateSignatureType, AggregateVerificationKey};
+
 /// `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/error.rs

@@ -18,7 +18,7 @@ pub enum AggregationError {
 /// Errors which can be output by Mithril aggregate verification.
 #[derive(Debug, Clone, thiserror::Error)]
 pub enum AggregateSignatureError {
-    /// This error occurs when the the serialization of the raw bytes failed
+    /// This error occurs when the serialization of the raw bytes failed
     #[error("Invalid bytes")]
     SerializationError,
 

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

@@ -22,15 +22,16 @@ mod tests {
     use rand_core::{RngCore, SeedableRng};
     use std::collections::{HashMap, HashSet};
 
-    use super::{
-        AggregateSignature, AggregateSignatureType, AggregationError, BasicVerifier, Clerk,
-    };
     use crate::{
         Initializer, KeyRegistration, Parameters, Signer, SingleSignature,
         SingleSignatureWithRegisteredParty, Stake, StmResult,
         membership_commitment::MerkleBatchPath, signature_scheme::BlsVerificationKey,
     };
 
+    use super::{
+        AggregateSignature, AggregateSignatureType, AggregationError, BasicVerifier, Clerk,
+    };
+
     type Sig = AggregateSignature<D>;
     type D = Blake2b<U32>;
 

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

@@ -4,12 +4,13 @@ use anyhow::anyhow;
 use blake2::digest::{Digest, FixedOutput};
 use serde::{Deserialize, Serialize};
 
-use super::{AggregateSignatureError, AggregateVerificationKey};
 use crate::{
     Parameters, StmError, StmResult, membership_commitment::MerkleBatchPath,
     proof_system::ConcatenationProof,
 };
 
+use super::{AggregateSignatureError, AggregateVerificationKey};
+
 /// The type of STM aggregate signature.
 #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum AggregateSignatureType {