chore(deps): improve organization of workspace (root Cargo.toml) (#874)

Author: StackOverflowExcept1on

Cargo.toml

@@ -12,7 +12,6 @@ members = [
     "gencode"
 ]
 
-
 [workspace.package]
 edition = "2021"
 version = "2.1.0"
@@ -38,5 +37,8 @@ rand_chacha = "0.3"
 rand_core = "0.6"
 serde_json = "1.0"
 
+frost-core = { path = "frost-core", version = "2.1.0", default-features = false }
+frost-rerandomized = { path = "frost-rerandomized", version = "2.1.0", default-features = false }
+
 [profile.test.package."*"]
-opt-level = 3
+opt-level = 3

book/src/dev/release-checklist.md

@@ -46,7 +46,7 @@ releases easier.
    - Move version in changelog to Released
    - Create a new version in “unreleased” in changelog
 
-- Update the version number for frost-core and frost-rerandomized in the Ciphersuite crates, e.g. in `frost-core = { path = "../frost-core", version = "0.4.0", features = ["test-impl"] }`. You'll need to do this for dependencies and dev-dependencies
+- Update the version number for frost-core and frost-rerandomized in the root Cargo.toml file, e.g. in `frost-core = { path = "frost-core", version = "0.4.0", default-features = false }`
 
 - Create a PR with subject `Release \<version number>` containing all these changes
 

frost-core/Cargo.toml

@@ -34,10 +34,10 @@ itertools = { version = "0.14.0", default-features = false }
 # Test dependencies used with the test-impl feature
 proptest = { version = "1.0", optional = true }
 serde_json = { version = "1.0", optional = true }
-criterion = { version = "0.5", optional = true }
+criterion = { workspace = true, optional = true }
 
 [dev-dependencies]
-criterion = { version = "0.5" }
+criterion.workspace = true
 lazy_static.workspace = true
 proptest.workspace = true
 rand.workspace = true

frost-ed25519/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "frost-ed25519"
 edition.workspace = true
-
 version.workspace = true
 authors.workspace = true
 readme = "README.md"
@@ -18,15 +17,15 @@ rustdoc-args = ["--cfg", "docsrs"]
 [dependencies]
 curve25519-dalek = { version = "=4.1.3", features = ["rand_core"] }
 document-features.workspace = true
-frost-core = { path = "../frost-core", version = "2.1.0", default-features = false }
-frost-rerandomized = { path = "../frost-rerandomized", version = "2.1.0", default-features = false }
+frost-core.workspace = true
+frost-rerandomized.workspace = true
 rand_core.workspace = true
 sha2 = { version = "0.10.2", default-features = false }
 
 [dev-dependencies]
 criterion.workspace = true
-frost-core = { path = "../frost-core", version = "2.1.0", features = ["test-impl"] }
-frost-rerandomized = { path = "../frost-rerandomized", version = "2.1.0", features = ["test-impl"] }
+frost-core = { workspace = true, features = ["std", "test-impl"] }
+frost-rerandomized = { workspace = true, features = ["std", "test-impl"] }
 ed25519-dalek = "2.1.0"
 insta.workspace = true
 hex.workspace = true

frost-ed448/Cargo.toml

@@ -17,15 +17,15 @@ rustdoc-args = ["--cfg", "docsrs"]
 [dependencies]
 document-features.workspace = true
 ed448-goldilocks = { version = "0.9.0" }
-frost-core = { path = "../frost-core", version = "2.1.0", default-features = false }
-frost-rerandomized = { path = "../frost-rerandomized", version = "2.1.0", default-features = false }
+frost-core.workspace = true
+frost-rerandomized.workspace = true
 rand_core.workspace = true
 sha3 = { version = "0.10.6", default-features = false }
 
 [dev-dependencies]
 criterion.workspace = true
-frost-core = { path = "../frost-core", version = "2.1.0", features = ["test-impl"] }
-frost-rerandomized = { path = "../frost-rerandomized", version = "2.1.0", features = ["test-impl"] }
+frost-core = { workspace = true, features = ["std", "test-impl"] }
+frost-rerandomized = { workspace = true, features = ["std", "test-impl"] }
 lazy_static.workspace = true
 insta.workspace = true
 hex.workspace = true

frost-p256/Cargo.toml

@@ -7,7 +7,7 @@ readme = "README.md"
 license.workspace = true
 repository.workspace = true
 categories.workspace = true
-keywords = ["cryptography", "crypto", "threshold", "signature"]
+keywords = ["cryptography", "crypto", "p256", "threshold", "signature"]
 description = "A Schnorr signature scheme over the NIST P-256 curve that supports FROST."
 
 [package.metadata.docs.rs]
@@ -17,15 +17,15 @@ rustdoc-args = ["--cfg", "docsrs"]
 [dependencies]
 document-features.workspace = true
 p256 = { version = "0.13.0", features = ["hash2curve"], default-features = false }
-frost-core = { path = "../frost-core", version = "2.1.0", default-features = false }
-frost-rerandomized = { path = "../frost-rerandomized", version = "2.1.0", default-features = false }
+frost-core.workspace = true
+frost-rerandomized.workspace = true
 rand_core.workspace = true
 sha2 = { version = "0.10.2", default-features = false }
 
 [dev-dependencies]
 criterion.workspace = true
-frost-core = { path = "../frost-core", version = "2.1.0", features = ["test-impl"] }
-frost-rerandomized = { path = "../frost-rerandomized", version = "2.1.0", features = ["test-impl"] }
+frost-core = { workspace = true, features = ["std", "test-impl"] }
+frost-rerandomized = { workspace = true, features = ["std", "test-impl"] }
 insta.workspace = true
 hex.workspace = true
 lazy_static.workspace = true

frost-rerandomized/Cargo.toml

@@ -17,9 +17,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 [dependencies]
 derive-getters = "0.5.0"
 document-features.workspace = true
-frost-core = { path = "../frost-core", version = "2.1.0", features = [
-    "internals"
-], default-features = false }
+frost-core = { workspace = true, features = ["internals"] }
 hex.workspace = true
 rand_core.workspace = true
 

frost-ristretto255/Cargo.toml

@@ -17,15 +17,15 @@ rustdoc-args = ["--cfg", "docsrs"]
 [dependencies]
 curve25519-dalek = { version = "=4.1.3", features = ["rand_core"] }
 document-features.workspace = true
-frost-core = { path = "../frost-core", version = "2.1.0", default-features = false }
-frost-rerandomized = { path = "../frost-rerandomized", version = "2.1.0", default-features = false }
+frost-core.workspace = true
+frost-rerandomized.workspace = true
 rand_core.workspace = true
 sha2 = { version = "0.10.2", default-features = false }
 
 [dev-dependencies]
-criterion = { version = "0.5", features = ["html_reports"] }
-frost-core = { path = "../frost-core", version = "2.1.0", features = ["test-impl"] }
-frost-rerandomized = { path = "../frost-rerandomized", version = "2.1.0", features = ["test-impl"] }
+criterion = { workspace = true, features = ["html_reports"] }
+frost-core = { workspace = true, features = ["std", "test-impl"] }
+frost-rerandomized = { workspace = true, features = ["std", "test-impl"] }
 insta.workspace = true
 hex.workspace = true
 lazy_static.workspace = true

frost-secp256k1-tr/Cargo.toml

@@ -7,7 +7,7 @@ readme = "README.md"
 license.workspace = true
 repository.workspace = true
 categories.workspace = true
-keywords = ["cryptography", "crypto", "threshold", "signature"]
+keywords = ["cryptography", "crypto", "secp256k1", "threshold", "signature"]
 description = "A Schnorr signature scheme over the secp256k1 curve that supports FROST and Taproot."
 
 [package.metadata.docs.rs]
@@ -16,16 +16,16 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
 document-features.workspace = true
-frost-core = { path = "../frost-core", version = "2.1.0", default-features = false }
-frost-rerandomized = { path = "../frost-rerandomized", version = "2.1.0", default-features = false }
+frost-core.workspace = true
+frost-rerandomized.workspace = true
 k256 = { version = "0.13.0", features = ["arithmetic", "expose-field", "hash2curve"], default-features = false }
 rand_core.workspace = true
 sha2 = { version = "0.10.2", default-features = false }
 
 [dev-dependencies]
 criterion.workspace = true
-frost-core = { path = "../frost-core", version = "2.1.0", features = ["test-impl"] }
-frost-rerandomized = { path = "../frost-rerandomized", version = "2.1.0", features = ["test-impl"] }
+frost-core = { workspace = true, features = ["std", "test-impl"] }
+frost-rerandomized = { workspace = true, features = ["std", "test-impl"] }
 insta.workspace = true
 hex.workspace = true
 lazy_static.workspace = true

frost-secp256k1/Cargo.toml

@@ -7,7 +7,7 @@ readme = "README.md"
 license.workspace = true
 repository.workspace = true
 categories.workspace = true
-keywords = ["cryptography", "crypto", "threshold", "signature"]
+keywords = ["cryptography", "crypto", "secp256k1", "threshold", "signature"]
 description = "A Schnorr signature scheme over the secp256k1 curve that supports FROST."
 
 [package.metadata.docs.rs]
@@ -16,16 +16,16 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
 document-features.workspace = true
-frost-core = { path = "../frost-core", version = "2.1.0", default-features = false }
-frost-rerandomized = { path = "../frost-rerandomized", version = "2.1.0", default-features = false }
+frost-core.workspace = true
+frost-rerandomized.workspace = true
 k256 = { version = "0.13.0", features = ["arithmetic", "expose-field", "hash2curve"], default-features = false }
 rand_core.workspace = true
 sha2 = { version = "0.10.2", default-features = false }
 
 [dev-dependencies]
 criterion.workspace = true
-frost-core = { path = "../frost-core", version = "2.1.0", features = ["test-impl"] }
-frost-rerandomized = { path = "../frost-rerandomized", version = "2.1.0", features = ["test-impl"] }
+frost-core = { workspace = true, features = ["std", "test-impl"] }
+frost-rerandomized = { workspace = true, features = ["std", "test-impl"] }
 insta.workspace = true
 hex.workspace = true
 lazy_static.workspace = true

gencode/Cargo.toml

@@ -4,8 +4,6 @@ version = "0.1.0"
 edition.workspace = true
 publish = false
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 regex = "1.6.0"
 serde_json.workspace = true