Merge branch 'main' into release-ferveo-py

nucypher · Apr 12, 2023 · d503b8a · d503b8a
2 parents 0ca00c9 + 8fa25b6
commit d503b8a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,12 @@
 <h1 align="center">Ferveo</h1>
 
-![ci-badge](https://github.com/nucypher/ferveo/actions/workflows/build.yaml/badge.svg)
+![ci-badge](https://github.com/nucypher/ferveo/actions/workflows/workspace.yml/badge.svg)
+
+_This project is under active development. For questions, please join us at [Threshold Network Discord](https://discord.com/invite/threshold&ved=2ahUKEwivucaW2Y3-AhXiwosKHQCEAKUQFnoECA0QAQ&usg=AOvVaw08x-9JYJFDcd6PEOx0xAeg)_
+
+_See original README.md:_
+
+---
 
 # Ferveo
 

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/tpke-wasm/Cargo.toml b/tpke-wasm/Cargo.toml
@@ -17,7 +17,7 @@ default = ["console_error_panic_hook"]
 test-common = ["group-threshold-cryptography/test-common"]
 
 [dependencies]
-group-threshold-cryptography = { path = "../tpke", features = ["test-common"] }
+group-threshold-cryptography = { path = "../tpke", features = ["test-common", "api"]  }
 ferveo-common = { path = "../ferveo-common" }
 wasm-bindgen = { version = "0.2.74", features = ["serde-serialize"] }
 console_error_panic_hook = { version = "0.1.7", optional = true }

diff --git a/tpke/Cargo.toml b/tpke/Cargo.toml
@@ -13,6 +13,7 @@ bench = false
 
 [features]
 test-common = []
+api = []
 
 [dependencies]
 subproductdomain = { path = "../subproductdomain" }

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