Merge branch 'main' into client-server-api

nucypher · Feb 15, 2023 · 2539dfc · 2539dfc
2 parents aa39d7a + 6022f00
commit 2539dfc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/ferveo/Cargo.toml b/ferveo/Cargo.toml
@@ -54,7 +54,6 @@ name = "benchmarks"
 path = "benches/bench_main.rs"
 harness = false
 
-
 [profile.release]
 opt-level = 3
 lto = true
diff --git a/ferveo/benches/benchmarks/pvdkg.rs b/ferveo/benches/benchmarks/pvdkg.rs
@@ -71,7 +71,6 @@ pub fn setup_dkg(
             tau: 0,
             security_threshold: shares_num / 3,
             shares_num,
-            retry_after: 2,
         },
         &me,
         keypairs[validator],

diff --git a/ferveo/src/dkg.rs b/ferveo/src/dkg.rs
@@ -29,6 +29,12 @@ pub struct Params {
     pub shares_num: u32,
 }
 
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum PvssScheduler {
+    Wait,
+    Issue,
+}
+
 #[derive(Debug, Clone)]
 pub enum DkgState<E: PairingEngine> {
     Sharing { accumulated_shares: u32, block: u32 },

diff --git a/tpke/Cargo.toml b/tpke/Cargo.toml
@@ -12,7 +12,10 @@ readme = "README.md"
 bench = false
 
 [features]
+default = ["api", "serialization"]
 test-common = []
+api = []
+serialization = []
 
 [dependencies]
 hex = "=0.4.3"

diff --git a/tpke/src/lib.rs b/tpke/src/lib.rs
@@ -25,8 +25,10 @@ pub use hash_to_curve::*;
 pub use key_share::*;
 pub use refresh::*;
 
-// TODO: Turn into a crate features
+#[cfg(feature = "api")]
 pub mod api;
+
+#[cfg(feature = "serialization")]
 pub mod serialization;
 
 #[derive(Debug, Error)]