wip

nucypher · Feb 14, 2024 · 21b062b · 21b062b
1 parent 779a7bb
commit 21b062b
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 360 deletions.
diff --git a/ferveo/benches/benchmarks/validity_checks.rs b/ferveo/benches/benchmarks/validity_checks.rs
@@ -55,11 +55,14 @@ fn setup_dkg(
 fn setup(
     shares_num: u32,
     rng: &mut StdRng,
-) -> (PubliclyVerifiableDkg<Bls12_381>, Message<Bls12_381>) {
+) -> (
+    PubliclyVerifiableDkg<Bls12_381>,
+    PubliclyVerifiableSS<Bls12_381>,
+) {
     let mut transcripts = vec![];
     for i in 0..shares_num {
         let mut dkg = setup_dkg(i as usize, shares_num);
-        transcripts.push(dkg.share(rng).expect("Test failed"));
+        transcripts.push(dkg.generate_transcript(rng).expect("Test failed"));
     }
     let dkg = setup_dkg(0, shares_num);
     let transcript = transcripts[0].clone();
@@ -78,20 +81,12 @@ pub fn bench_verify_full(c: &mut Criterion) {
 
         let pvss_verify_optimistic = {
             move || {
-                if let Message::Deal(ss) = transcript {
-                    black_box(ss.verify_optimistic());
-                } else {
-                    panic!("Expected Deal");
-                }
+                black_box(transcript.verify_optimistic());
             }
         };
         let pvss_verify_full = {
             move || {
-                if let Message::Deal(ss) = transcript {
-                    black_box(ss.verify_full(&dkg));
-                } else {
-                    panic!("Expected Deal");
-                }
+                black_box(transcript.verify_full(&dkg));
             }
         };
 

diff --git a/ferveo/examples/bench_primitives_size.rs b/ferveo/examples/bench_primitives_size.rs
@@ -95,14 +95,14 @@ fn setup(
     let mut transcripts = vec![];
     for i in 0..shares_num {
         let mut dkg = setup_dkg(i as usize, shares_num, security_threshold);
-        let message = dkg.share(rng).expect("Test failed");
+        let message = dkg.generate_transcript(rng).expect("Test failed");
         let sender = dkg.get_validator(&dkg.me.public_key).unwrap();
         transcripts.push((sender.clone(), message.clone()));
     }
 
     let mut dkg = setup_dkg(0, shares_num, security_threshold);
     for (sender, pvss) in transcripts.into_iter() {
-        dkg.apply_message(&sender, &pvss).expect("Setup failed");
+        dkg.apply_transcript(&sender, &pvss).expect("Setup failed");
     }
     dkg
 }

diff --git a/ferveo/src/api.rs b/ferveo/src/api.rs
@@ -26,7 +26,7 @@ use crate::bindings_python;
 use crate::bindings_wasm;
 pub use crate::EthereumAddress;
 use crate::{
-    do_verify_aggregation, DomainPoint, Error, Message, PVSSMap,
+    do_verify_aggregation, DomainPoint, Error, PVSSMap,
     PubliclyVerifiableParams, PubliclyVerifiableSS, Result,
 };
 
@@ -230,11 +230,7 @@ impl Dkg {
         &mut self,
         rng: &mut R,
     ) -> Result<Transcript> {
-        match self.0.share(rng) {
-            Ok(Message::Deal(transcript)) => Ok(transcript),
-            Err(e) => Err(e),
-            _ => Err(Error::InvalidDkgStateToDeal),
-        }
+        self.0.generate_transcript(rng)
     }
 
     pub fn aggregate_transcripts(
@@ -684,7 +680,7 @@ mod test_ferveo_api {
                     sender,
                 )
                 .unwrap();
-                (sender.clone(), dkg.generate_transcript(rng).unwrap())
+                (sender.clone(), dkg.0.generate_transcript(rng).unwrap())
             })
             .collect();