moved merkle tree errors

Author: damrobi

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

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

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

@@ -2,9 +2,9 @@ use std::cmp::Ordering;
 
 use serde::{Deserialize, Serialize};
 
-use crate::{
-    MerkleTreeError, Stake, StmResult, VerificationKey, signature_scheme::BlsVerificationKey,
-};
+use super::MerkleTreeError;
+
+use crate::{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/path.rs

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

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

@@ -3,10 +3,10 @@ use serde::{Deserialize, Serialize};
 use std::marker::PhantomData;
 
 use super::{
-    MerkleBatchPath, MerklePath, MerkleTreeBatchCommitment, MerkleTreeCommitment, MerkleTreeLeaf,
-    left_child, parent, right_child, sibling,
+    MerkleBatchPath, MerklePath, MerkleTreeBatchCommitment, MerkleTreeCommitment, MerkleTreeError,
+    MerkleTreeLeaf, left_child, parent, right_child, sibling,
 };
-use crate::{MerkleTreeError, StmResult};
+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/error.rs

@@ -40,20 +40,20 @@ use crate::{
 // }
 
 /// Error types related to merkle trees.
-#[derive(Debug, Clone, thiserror::Error)]
-pub enum MerkleTreeError {
-    /// Serialization error
-    #[error("Serialization of a merkle tree failed")]
-    SerializationError,
+// #[derive(Debug, Clone, thiserror::Error)]
+// pub enum MerkleTreeError {
+//     /// Serialization error
+//     #[error("Serialization of a merkle tree failed")]
+//     SerializationError,
 
-    /// Invalid merkle path
-    #[error("Path does not verify against root")]
-    PathInvalid(Vec<u8>),
+//     /// Invalid merkle path
+//     #[error("Path does not verify against root")]
+//     PathInvalid(Vec<u8>),
 
-    /// Invalid merkle batch path
-    #[error("Batch path does not verify against root")]
-    BatchPathInvalid(Vec<u8>),
-}
+//     /// Invalid merkle batch path
+//     #[error("Batch path does not verify against root")]
+//     BatchPathInvalid(Vec<u8>),
+// }
 
 /// Errors which can be output by Mithril single signature verification.
 #[derive(Debug, Clone, thiserror::Error)]

mithril-stm/src/protocol/mod.rs

@@ -10,9 +10,7 @@ pub use aggregate_signature::{
     AggregateSignature, AggregateSignatureType, AggregateVerificationKey, BasicVerifier, Clerk,
 };
 pub(crate) use eligibility_check::is_lottery_won;
-pub use error::{
-    AggregateSignatureError, AggregationError, MerkleTreeError, RegisterError, SignatureError,
-};
+pub use error::{AggregateSignatureError, AggregationError, RegisterError, SignatureError};
 pub use key_registration::{ClosedKeyRegistration, KeyRegistration, RegisteredParty};
 pub use parameters::Parameters;
 pub use participant::{Initializer, Signer, VerificationKey, VerificationKeyProofOfPossession};