From 4e8edda8f2645b89df628bba75f853b6e87ed93c Mon Sep 17 00:00:00 2001 From: Romain Ruetschi Date: Tue, 7 Nov 2023 15:01:44 +0100 Subject: [PATCH] Use workspace depdencies and common settings --- Code/Cargo.toml | 14 ++++++++++++++ Code/common/Cargo.toml | 16 ++++++++++------ Code/consensus/Cargo.toml | 14 +++++++++----- Code/round/Cargo.toml | 12 ++++++++---- Code/test/Cargo.toml | 22 +++++++++++++--------- Code/vote/Cargo.toml | 12 ++++++++---- 6 files changed, 62 insertions(+), 28 deletions(-) diff --git a/Code/Cargo.toml b/Code/Cargo.toml index d522ca3a4..beb3909f2 100644 --- a/Code/Cargo.toml +++ b/Code/Cargo.toml @@ -8,3 +8,17 @@ members = [ "vote", "test", ] + +[workspace.package] +version = "0.1.0" +edition = "2021" +repository = "https://github.com/informalsystems/malachite" +license = "Apache-2.0" +publish = false + +[workspace.dependencies] +ed25519-consensus = "2.1.0" +rand = { version = "0.8.5", features = ["std_rng"] } +secrecy = "0.8.0" +sha2 = "0.10.8" +signature = "2.1.0" diff --git a/Code/common/Cargo.toml b/Code/common/Cargo.toml index 37a2afea2..cd02c85dc 100644 --- a/Code/common/Cargo.toml +++ b/Code/common/Cargo.toml @@ -1,9 +1,13 @@ [package] -name = "malachite-common" -version = "0.1.0" -edition = "2021" -publish = false +name = "malachite-common" +description = "Common datatypes and interfaces for the Malachite consensus engine" + +version.workspace = true +edition.workspace = true +repository.workspace = true +license.workspace = true +publish.workspace = true [dependencies] -secrecy = "0.8.0" -signature = "2.1.0" +secrecy.workspace = true +signature.workspace = true diff --git a/Code/consensus/Cargo.toml b/Code/consensus/Cargo.toml index b4c137a2b..9144e823a 100644 --- a/Code/consensus/Cargo.toml +++ b/Code/consensus/Cargo.toml @@ -1,12 +1,16 @@ [package] -name = "malachite-consensus" -version = "0.1.0" -edition = "2021" -publish = false +name = "malachite-consensus" +description = "Malachite consensus engine" + +version.workspace = true +edition.workspace = true +repository.workspace = true +license.workspace = true +publish.workspace = true [dependencies] malachite-common = { version = "0.1.0", path = "../common" } malachite-round = { version = "0.1.0", path = "../round" } malachite-vote = { version = "0.1.0", path = "../vote" } -secrecy = "0.8.0" +secrecy.workspace = true diff --git a/Code/round/Cargo.toml b/Code/round/Cargo.toml index 8a948ff59..d672a7b42 100644 --- a/Code/round/Cargo.toml +++ b/Code/round/Cargo.toml @@ -1,8 +1,12 @@ [package] -name = "malachite-round" -version = "0.1.0" -edition = "2021" -publish = false +name = "malachite-round" +description = "Per-round state-machine for the Malachite consenss engine" + +version.workspace = true +edition.workspace = true +repository.workspace = true +license.workspace = true +publish.workspace = true [dependencies] malachite-common = { version = "0.1.0", path = "../common" } diff --git a/Code/test/Cargo.toml b/Code/test/Cargo.toml index f06726148..e7964c2e7 100644 --- a/Code/test/Cargo.toml +++ b/Code/test/Cargo.toml @@ -1,8 +1,12 @@ [package] -name = "malachite-test" -version = "0.1.0" -edition = "2021" -publish = false +name = "malachite-test" +description = "Testing framework for the Malachite consensus engine" +publish = false + +version.workspace = true +edition.workspace = true +repository.workspace = true +license.workspace = true [dependencies] malachite-common = { version = "0.1.0", path = "../common" } @@ -10,8 +14,8 @@ malachite-consensus = { version = "0.1.0", path = "../consensus" } malachite-round = { version = "0.1.0", path = "../round" } malachite-vote = { version = "0.1.0", path = "../vote" } -ed25519-consensus = "2.1.0" -signature = "2.1.0" -rand = { version = "0.8.5", features = ["std_rng"] } -sha2 = "0.10.8" -secrecy = "0.8.0" +ed25519-consensus.workspace = true +signature.workspace = true +rand.workspace = true +sha2.workspace = true +secrecy.workspace = true diff --git a/Code/vote/Cargo.toml b/Code/vote/Cargo.toml index 64d9e4306..184172208 100644 --- a/Code/vote/Cargo.toml +++ b/Code/vote/Cargo.toml @@ -1,8 +1,12 @@ [package] -name = "malachite-vote" -version = "0.1.0" -edition = "2021" -publish = false +name = "malachite-vote" +description = "Voting system for the Malachite consensus engine" + +version.workspace = true +edition.workspace = true +repository.workspace = true +license.workspace = true +publish.workspace = true [dependencies] malachite-common = { version = "0.1.0", path = "../common" }