SNARK-friendly STM: Re-organize modules

mithril-stm/src/aggregate_signature/aggregate_key.rs

@@ -1,7 +1,7 @@
 use blake2::digest::{Digest, FixedOutput};
 use serde::{Deserialize, Serialize};
 
-use crate::merkle_tree::{MerkleBatchPath, MerkleTreeBatchCommitment};
+use crate::membership_commitment::{MerkleBatchPath, MerkleTreeBatchCommitment};
 use crate::{ClosedKeyRegistration, Stake};
 
 /// Stm aggregate key (batch compatible), which contains the merkle tree commitment and the total stake of the system.

mithril-stm/src/aggregate_signature/basic_verifier.rs

@@ -1,9 +1,9 @@
 use anyhow::{Context, anyhow};
 use std::collections::{BTreeMap, HashMap, HashSet};
 
-use crate::bls_multi_signature::{BlsSignature, BlsVerificationKey};
 use crate::key_registration::RegisteredParty;
-use crate::merkle_tree::MerkleTreeLeaf;
+use crate::membership_commitment::MerkleTreeLeaf;
+use crate::signature_scheme::{BlsSignature, BlsVerificationKey};
 use crate::{
     AggregationError, Index, Parameters, SingleSignature, SingleSignatureWithRegisteredParty,
     Stake, StmResult,

mithril-stm/src/aggregate_signature/clerk.rs

@@ -1,7 +1,7 @@
 use crate::{
     AggregateSignature, AggregateSignatureType, AggregateVerificationKey, ClosedKeyRegistration,
     Index, Parameters, Signer, SingleSignature, Stake, StmResult, VerificationKey,
-    aggregate_signature::ConcatenationProof,
+    proof_system::ConcatenationProof,
 };
 use anyhow::Context;
 use blake2::digest::{Digest, FixedOutput};

mithril-stm/src/aggregate_signature/mod.rs

@@ -1,13 +1,11 @@
 mod aggregate_key;
 mod basic_verifier;
 mod clerk;
-mod proof;
 mod signature;
 
 pub use aggregate_key::*;
 pub use basic_verifier::*;
 pub use clerk::*;
-pub use proof::*;
 pub use signature::*;
 
 #[cfg(test)]
@@ -26,9 +24,9 @@ mod tests {
     use crate::{
         AggregateSignature, AggregateSignatureType, AggregationError, BasicVerifier, Clerk,
         Initializer, KeyRegistration, Parameters, Signer, SingleSignature,
-        SingleSignatureWithRegisteredParty, Stake, bls_multi_signature::BlsVerificationKey,
+        SingleSignatureWithRegisteredParty, Stake, signature_scheme::BlsVerificationKey,
     };
-    use crate::{StmResult, merkle_tree::MerkleBatchPath};
+    use crate::{StmResult, membership_commitment::MerkleBatchPath};
 
     type Sig = AggregateSignature<D>;
     type D = Blake2b<U32>;

mithril-stm/src/aggregate_signature/signature.rs

@@ -7,10 +7,8 @@ use blake2::digest::{Digest, FixedOutput};
 use serde::{Deserialize, Serialize};
 
 use crate::error::AggregateSignatureError;
-use crate::merkle_tree::MerkleBatchPath;
-use crate::{AggregateVerificationKey, Parameters, StmResult};
-
-use super::ConcatenationProof;
+use crate::membership_commitment::MerkleBatchPath;
+use crate::{AggregateVerificationKey, Parameters, StmResult, proof_system::ConcatenationProof};
 
 /// The type of STM aggregate signature.
 #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -211,7 +209,7 @@ mod tests {
         use rand_chacha::ChaCha20Rng;
         use rand_core::SeedableRng;
 
-        use crate::bls_multi_signature::{BlsSigningKey, BlsVerificationKeyProofOfPossession};
+        use crate::signature_scheme::{BlsSigningKey, BlsVerificationKeyProofOfPossession};
         use crate::{
             AggregateSignature, AggregateSignatureType, Clerk, ClosedKeyRegistration,
             KeyRegistration, Parameters, Signer,

mithril-stm/src/error.rs

@@ -4,7 +4,7 @@ use blst::BLST_ERROR;
 
 use crate::StmResult;
 use crate::aggregate_signature::AggregateSignatureType;
-use crate::bls_multi_signature::{
+use crate::signature_scheme::{
     BlsSignature, BlsVerificationKey, BlsVerificationKeyProofOfPossession,
 };
 

mithril-stm/src/key_registration.rs

@@ -7,9 +7,9 @@ use std::{
 use anyhow::anyhow;
 use blake2::digest::{Digest, FixedOutput};
 
-use crate::bls_multi_signature::{BlsVerificationKey, BlsVerificationKeyProofOfPossession};
 use crate::error::RegisterError;
-use crate::merkle_tree::{MerkleTree, MerkleTreeLeaf};
+use crate::membership_commitment::{MerkleTree, MerkleTreeLeaf};
+use crate::signature_scheme::{BlsVerificationKey, BlsVerificationKeyProofOfPossession};
 use crate::{Stake, StmResult};
 
 /// Stores a registered party with its public key and the associated stake.
@@ -94,7 +94,7 @@ mod tests {
     use rand_chacha::ChaCha20Rng;
     use rand_core::SeedableRng;
 
-    use crate::bls_multi_signature::BlsSigningKey;
+    use crate::signature_scheme::BlsSigningKey;
 
     use super::*;
 

mithril-stm/src/lib.rs

@@ -112,13 +112,14 @@
 //! ```
 
 mod aggregate_signature;
-mod bls_multi_signature;
 mod eligibility_check;
 mod error;
 mod key_registration;
-mod merkle_tree;
+mod membership_commitment;
 mod parameters;
 mod participant;
+mod proof_system;
+mod signature_scheme;
 mod single_signature;
 
 pub use aggregate_signature::{
@@ -133,7 +134,7 @@
 pub use single_signature::{SingleSignature, SingleSignatureWithRegisteredParty};
 
 #[cfg(feature = "benchmark-internals")]
-pub use bls_multi_signature::{
+pub use signature_scheme::{
     BlsProofOfPossession, BlsSignature, BlsSigningKey, BlsVerificationKey,
     BlsVerificationKeyProofOfPossession,
 };

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

@@ -5,7 +5,9 @@ use serde::{Deserialize, Serialize};
 
 use crate::StmResult;
 use crate::error::MerkleTreeError;
-use crate::merkle_tree::{MerkleBatchPath, MerklePath, MerkleTreeLeaf, parent, sibling};
+use crate::membership_commitment::merkle_tree::{
+    MerkleBatchPath, MerklePath, MerkleTreeLeaf, parent, sibling,
+};
 use anyhow::{Context, anyhow};
 /// `MerkleTree` commitment.
 /// This structure differs from `MerkleTree` in that it does not contain all elements, which are not always necessary.