adapt common, demo and stm benches

Author: curiecrypt

demo/protocol-demo/src/types.rs

@@ -1,12 +1,10 @@
 use mithril_stm::{
-    AggregateSignature, Clerk, Initializer, KeyRegistration, Parameters, Signer, SingleSignature,
-    Stake, VerificationKeyProofOfPossession,
+    AggregateSignature, Clerk, CustomMembershipDigest, Initializer, KeyRegistration, Parameters,
+    Signer, SingleSignature, Stake, VerificationKeyProofOfPossession,
 };
 
-use blake2::{Blake2b, digest::consts::U32};
-
 // Protocol types alias
-type D = Blake2b<U32>;
+type D = CustomMembershipDigest;
 
 /// The id of a mithril party.
 pub type ProtocolPartyId = String;

mithril-common/src/crypto_helper/cardano/key_certification.rs

@@ -6,18 +6,14 @@
 use std::{collections::HashMap, sync::Arc};
 
 use anyhow::anyhow;
-use blake2::{
-    Blake2b, Digest,
-    digest::{FixedOutput, consts::U32},
-};
 use kes_summed_ed25519::kes::Sum6KesSig;
 use rand_core::{CryptoRng, RngCore};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
 use mithril_stm::{
-    ClosedKeyRegistration, Initializer, KeyRegistration, Parameters, RegisterError, Signer, Stake,
-    VerificationKeyProofOfPossession,
+    ClosedKeyRegistration, CustomMembershipDigest, Initializer, KeyRegistration, MembershipDigest,
+    Parameters, RegisterError, Signer, Stake, VerificationKeyProofOfPossession,
 };
 
 use crate::{
@@ -33,7 +29,7 @@ use crate::{
 };
 
 // Protocol types alias
-type D = Blake2b<U32>;
+type D = CustomMembershipDigest;
 
 /// The KES period that is used to check if the KES keys is expired
 pub type KesPeriod = u32;
@@ -285,7 +281,7 @@ impl KeyRegWrapper {
 
     /// Finalize the key registration.
     /// This function disables `ClosedKeyRegistration::register`, consumes the instance of `self`, and returns a `ClosedKeyRegistration`.
-    pub fn close<D: Digest + FixedOutput>(self) -> ClosedKeyRegistration<D> {
+    pub fn close<D: MembershipDigest>(self) -> ClosedKeyRegistration<D> {
         self.stm_key_reg.close()
     }
 }

mithril-common/src/crypto_helper/codec/binary.rs

@@ -29,17 +29,15 @@ pub trait TryFromBytes: Sized {
 
 mod binary_mithril_stm {
     use anyhow::anyhow;
-    use blake2::Blake2b;
-
-    use digest::consts::U32;
     use mithril_stm::{
-        AggregateSignature, AggregateVerificationKey, Initializer, Parameters, SingleSignature,
-        SingleSignatureWithRegisteredParty, VerificationKey, VerificationKeyProofOfPossession,
+        AggregateSignature, AggregateVerificationKey, CustomMembershipDigest, Initializer,
+        Parameters, SingleSignature, SingleSignatureWithRegisteredParty, VerificationKey,
+        VerificationKeyProofOfPossession,
     };
 
     use super::*;
 
-    type D = Blake2b<U32>;
+    type D = CustomMembershipDigest;
 
     impl TryToBytes for Parameters {
         fn to_bytes_vec(&self) -> StdResult<Vec<u8>> {

mithril-common/src/crypto_helper/types/alias.rs

@@ -4,16 +4,15 @@ use crate::crypto_helper::cardano::{
 };
 
 use mithril_stm::{
-    AggregationError, Clerk, ClosedKeyRegistration, Index, Parameters, Signer, Stake,
+    AggregationError, Clerk, ClosedKeyRegistration, CustomMembershipDigest, Index, Parameters,
+    Signer, Stake,
 };
 
-use blake2::{Blake2b, digest::consts::U32};
-
 /// A protocol version
 pub type ProtocolVersion<'a> = &'a str;
 
 // Protocol types alias
-pub(crate) type D = Blake2b<U32>;
+pub(crate) type D = CustomMembershipDigest;
 
 /// The id of a mithril party.
 pub type ProtocolPartyId = String;

mithril-stm/benches/size_benches.rs

@@ -1,21 +1,18 @@
-use blake2::digest::FixedOutput;
-use blake2::{
-    Blake2b, Digest,
-    digest::consts::{U32, U64},
-};
+use blake2::{Blake2b, digest::consts::U64};
 use rand_chacha::ChaCha20Rng;
 use rand_core::{RngCore, SeedableRng};
 use rayon::iter::ParallelIterator;
 use rayon::prelude::{IntoParallelIterator, IntoParallelRefIterator};
 
 use mithril_stm::{
-    AggregateSignatureType, BasicVerifier, Clerk, Initializer, KeyRegistration, Parameters, Signer,
-    SingleSignature, SingleSignatureWithRegisteredParty, Stake, VerificationKey,
+    AggregateSignatureType, BasicVerifier, Clerk, CustomMembershipDigest, Initializer,
+    KeyRegistration, MembershipDigest, Parameters, Signer, SingleSignature,
+    SingleSignatureWithRegisteredParty, Stake, VerificationKey,
 };
 
 fn size<H>(k: u64, m: u64, nparties: usize, hash_name: &str)
 where
-    H: Digest + Clone + Sync + Send + Default + FixedOutput,
+    H: MembershipDigest + Clone,
 {
     println!("+-------------------+");
     println!("| Hash: {hash_name} |");
@@ -68,7 +65,7 @@ where
 
 fn core_size<H>(k: u64, m: u64, nparties: usize)
 where
-    H: Digest + Clone + Sync + Send + Default + FixedOutput,
+    H: MembershipDigest + Clone,
 {
     let mut rng = ChaCha20Rng::from_seed([0u8; 32]);
     let mut msg = [0u8; 16];
@@ -128,6 +125,16 @@ where
     println!("k = {k} | m = {m} | nr parties = {nparties}; {size_sigs} bytes",);
 }
 
+/// Only for size benches
+#[derive(Clone, Debug, Default)]
+pub struct MembershipDigestU64 {}
+
+impl MembershipDigest for MembershipDigestU64 {
+    type ConcatenationHash = Blake2b<U64>;
+    #[cfg(feature = "future_snark")]
+    type SnarkHash = Blake2b<U64>;
+}
+
 fn main() {
     println!("+-------------------+");
     println!("|   Size of proofs  |");
@@ -137,8 +144,8 @@ fn main() {
 
     let params: [(u64, u64, usize); 2] = [(445, 2728, 3000), (554, 3597, 3000)];
     for (k, m, nparties) in params {
-        size::<Blake2b<U64>>(k, m, nparties, "Blake2b 512");
-        size::<Blake2b<U32>>(k, m, nparties, "Blake2b 256");
+        size::<MembershipDigestU64>(k, m, nparties, "Blake2b 512");
+        size::<CustomMembershipDigest>(k, m, nparties, "Blake2b 256");
     }
 
     println!("\n+-------------------------+");
@@ -147,7 +154,7 @@ fn main() {
     println!("+-------------------------+");
 
     for (k, m, nparties) in params {
-        core_size::<Blake2b<U64>>(k, m, nparties);
+        core_size::<MembershipDigestU64>(k, m, nparties);
     }
     println!("+-------------------------+");
 }

mithril-stm/benches/stm.rs

@@ -1,26 +1,24 @@
-use std::fmt::Debug;
-
-use blake2::digest::{Digest, FixedOutput};
-use blake2::{Blake2b, digest::consts::U32};
 use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
 use rand_chacha::ChaCha20Rng;
 use rand_core::{RngCore, SeedableRng};
 use rayon::prelude::*;
 
 use mithril_stm::{
-    AggregateSignature, AggregateSignatureType, BasicVerifier, Clerk, Initializer, KeyRegistration,
-    Parameters, Signer, Stake, VerificationKey,
+    AggregateSignature, AggregateSignatureType, BasicVerifier, Clerk, CustomMembershipDigest,
+    Initializer, KeyRegistration, MembershipDigest, Parameters, Signer, Stake, VerificationKey,
 };
 
 /// This benchmark framework is not ideal. We really have to think what is the best mechanism for
 /// benchmarking these signatures, over which parameters, how many times to run them, etc:
 /// * Registration depends on the number of parties (should be constant, as it is a lookup table)
 /// * Signing depends on the parameter `m`, as it defines the number of lotteries a user can play
 /// * Aggregation depends on `k`.
-fn stm_benches<H>(c: &mut Criterion, nr_parties: usize, params: Parameters, hashing_alg: &str)
-where
-    H: Clone + Debug + Digest + Send + Sync + FixedOutput + Default,
-{
+fn stm_benches<H: MembershipDigest + Clone>(
+    c: &mut Criterion,
+    nr_parties: usize,
+    params: Parameters,
+    hashing_alg: &str,
+) {
     let mut group = c.benchmark_group(format!("STM/{hashing_alg}"));
     let mut rng = ChaCha20Rng::from_seed([0u8; 32]);
     let mut msg = [0u8; 16];
@@ -55,10 +53,10 @@ where
 
     let closed_reg = key_reg.close();
 
-    let signers = initializers
+    let signers: Vec<Signer<H>> = initializers
         .into_par_iter()
         .map(|p| p.create_signer(closed_reg.clone()).unwrap())
-        .collect::<Vec<Signer<H>>>();
+        .collect();
 
     group.bench_function(BenchmarkId::new("Play all lotteries", &param_string), |b| {
         b.iter(|| {
@@ -83,7 +81,7 @@ fn batch_benches<H>(
     params: Parameters,
     hashing_alg: &str,
 ) where
-    H: Clone + Debug + Digest + FixedOutput + Send + Sync,
+    H: MembershipDigest + Clone,
 {
     let mut group = c.benchmark_group(format!("STM/{hashing_alg}"));
     let mut rng = ChaCha20Rng::from_seed([0u8; 32]);
@@ -157,7 +155,7 @@ fn batch_benches<H>(
 
 fn basic_verifier_benches<H>(c: &mut Criterion, nr_parties: usize, params: Parameters)
 where
-    H: Clone + Debug + Digest + Send + Sync + FixedOutput + Default,
+    H: MembershipDigest + Clone,
 {
     let mut group = c.benchmark_group("Core verifier");
     let mut rng = ChaCha20Rng::from_seed([0u8; 32]);
@@ -209,7 +207,7 @@ where
 }
 
 fn batch_stm_benches_blake_300(c: &mut Criterion) {
-    batch_benches::<Blake2b<U32>>(
+    batch_benches::<CustomMembershipDigest>(
         c,
         &[1, 10, 20, 100],
         300,
@@ -223,7 +221,7 @@ fn batch_stm_benches_blake_300(c: &mut Criterion) {
 }
 
 fn stm_benches_blake_300(c: &mut Criterion) {
-    stm_benches::<Blake2b<U32>>(
+    stm_benches::<CustomMembershipDigest>(
         c,
         300,
         Parameters {
@@ -236,7 +234,7 @@ fn stm_benches_blake_300(c: &mut Criterion) {
 }
 
 fn core_verifier_benches_blake_300(c: &mut Criterion) {
-    basic_verifier_benches::<Blake2b<U32>>(
+    basic_verifier_benches::<CustomMembershipDigest>(
         c,
         300,
         Parameters {
@@ -248,7 +246,7 @@ fn core_verifier_benches_blake_300(c: &mut Criterion) {
 }
 
 fn batch_stm_benches_blake_2000(c: &mut Criterion) {
-    batch_benches::<Blake2b<U32>>(
+    batch_benches::<CustomMembershipDigest>(
         c,
         &[1, 10, 20, 100],
         2000,
@@ -262,7 +260,7 @@ fn batch_stm_benches_blake_2000(c: &mut Criterion) {
 }
 
 fn stm_benches_blake_2000(c: &mut Criterion) {
-    stm_benches::<Blake2b<U32>>(
+    stm_benches::<CustomMembershipDigest>(
         c,
         2000,
         Parameters {
@@ -275,7 +273,7 @@ fn stm_benches_blake_2000(c: &mut Criterion) {
 }
 
 fn core_verifier_benches_blake_2000(c: &mut Criterion) {
-    basic_verifier_benches::<Blake2b<U32>>(
+    basic_verifier_benches::<CustomMembershipDigest>(
         c,
         2000,
         Parameters {

mithril-stm/src/membership_commitment/mod.rs

@@ -6,14 +6,14 @@ use blake2::{Blake2b, digest::consts::U32};
 use digest::{Digest, FixedOutput};
 use std::fmt::Debug;
 
-pub trait MembershipDigest: Send + Sync {
-    type ConcatenationHash: Digest + FixedOutput + Clone + Debug;
+pub trait MembershipDigest {
+    type ConcatenationHash: Digest + FixedOutput + Clone + Debug + Send + Sync;
     #[cfg(feature = "future_snark")]
     type SnarkHash: Digest + FixedOutput + Clone;
 }
 
 /// Only for tests
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 pub struct CustomMembershipDigest {}
 
 impl MembershipDigest for CustomMembershipDigest {