From 6f6699da21a3d9d4e8b7612c79471a0a9621050a Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Wed, 25 Sep 2024 12:03:27 -0600 Subject: [PATCH] Use common workspace package stanza & workspace dependencies. This requires us to upgrade our MSRV to 1.64 --- Cargo.toml | 15 +++++++++++++++ bridgetree/CHANGELOG.md | 3 +++ bridgetree/Cargo.toml | 22 +++++++++++----------- incrementalmerkletree/CHANGELOG.md | 3 +++ incrementalmerkletree/Cargo.toml | 16 ++++++++-------- rust-toolchain.toml | 2 +- shardtree/CHANGELOG.md | 3 +++ shardtree/Cargo.toml | 22 +++++++++++----------- 8 files changed, 55 insertions(+), 31 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 98ebc88c..7c953ec0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,3 +4,18 @@ members = [ "bridgetree", "shardtree", ] + +[workspace.package] +edition = "2021" +rust-version = "1.64" +repository = "https://github.com/zcash/incrementalmerkletree" +homepage = "https://github.com/zcash/incrementalmerkletree" +license = "MIT OR Apache-2.0" +categories = ["algorithms", "data-structures"] + +[workspace.dependencies] +# Intra-workspace dependencies +incrementalmerkletree = { version = "0.6", path = "incrementalmerkletree" } + +# Testing +proptest = "1" diff --git a/bridgetree/CHANGELOG.md b/bridgetree/CHANGELOG.md index 5f8a7202..4c7d5820 100644 --- a/bridgetree/CHANGELOG.md +++ b/bridgetree/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to Rust's notion of ## [Unreleased] +### Changed +- MSRV is now 1.64 + ## [0.5.0] - 2024-08-12 ### Changed diff --git a/bridgetree/Cargo.toml b/bridgetree/Cargo.toml index 3fb02b33..fb4a072b 100644 --- a/bridgetree/Cargo.toml +++ b/bridgetree/Cargo.toml @@ -1,25 +1,25 @@ [package] name = "bridgetree" +description = "A space-efficient Merkle tree designed for linear appends with witnessing of marked leaves, checkpointing & state restoration." version = "0.5.0" authors = [ "Kris Nuttycombe ", "Sean Bowe ", ] -edition = "2021" -license = "MIT OR Apache-2.0" -description = "A space-efficient Merkle tree designed for linear appends with witnessing of marked leaves, checkpointing & state restoration." -homepage = "https://github.com/zcash/incrementalmerkletree" -repository = "https://github.com/zcash/incrementalmerkletree" -categories = ["algorithms", "data-structures"] -rust-version = "1.60" +edition.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true +categories.workspace = true +rust-version.workspace = true [dependencies] -incrementalmerkletree = { version = "0.6", path = "../incrementalmerkletree" } -proptest = { version = "1.0.0", optional = true } +incrementalmerkletree.workspace = true +proptest = { workspace = true, optional = true } [dev-dependencies] -incrementalmerkletree = { version = "0.6", path = "../incrementalmerkletree", features = ["test-dependencies"] } -proptest = "1.0.0" +incrementalmerkletree = { workspace = true, features = ["test-dependencies"] } +proptest.workspace = true [features] test-dependencies = ["proptest"] diff --git a/incrementalmerkletree/CHANGELOG.md b/incrementalmerkletree/CHANGELOG.md index efbacf25..774c2bb5 100644 --- a/incrementalmerkletree/CHANGELOG.md +++ b/incrementalmerkletree/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to Rust's notion of ## Unreleased +### Changed +- MSRV is now 1.64 + ## [0.6.0] - 2024-08-12 ### Added diff --git a/incrementalmerkletree/Cargo.toml b/incrementalmerkletree/Cargo.toml index c35c7768..1336e159 100644 --- a/incrementalmerkletree/Cargo.toml +++ b/incrementalmerkletree/Cargo.toml @@ -6,12 +6,12 @@ authors = [ "Sean Bowe ", "Kris Nuttycombe ", ] -edition = "2021" -license = "MIT OR Apache-2.0" -homepage = "https://github.com/zcash/incrementalmerkletree" -repository = "https://github.com/zcash/incrementalmerkletree" -categories = ["algorithms", "data-structures"] -rust-version = "1.60" +edition.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true +categories.workspace = true +rust-version.workspace = true [package.metadata.docs.rs] all-features = true @@ -19,12 +19,12 @@ rustdoc-args = ["--cfg", "docsrs"] [dependencies] either = "1.8" -proptest = { version = "1.0.0", optional = true } +proptest = { workspace = true, optional = true } rand = { version = "0.8", optional = true } rand_core = { version = "0.6", optional = true } [dev-dependencies] -proptest = "1.0.0" +proptest.workspace = true rand = "0.8" rand_core = "0.6" rand_chacha = "0.3" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index e06e5ca5..b2593066 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.60.0" +channel = "1.64.0" components = [ "clippy", "rustfmt" ] diff --git a/shardtree/CHANGELOG.md b/shardtree/CHANGELOG.md index 93309010..83720899 100644 --- a/shardtree/CHANGELOG.md +++ b/shardtree/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to Rust's notion of ## Unreleased +### Changed +- MSRV is now 1.64 + ### Added - `shardtree::store::ShardStore::for_each_checkpoint` diff --git a/shardtree/Cargo.toml b/shardtree/Cargo.toml index a56cb969..ddf09a75 100644 --- a/shardtree/Cargo.toml +++ b/shardtree/Cargo.toml @@ -1,16 +1,16 @@ [package] name = "shardtree" +description = "A space-efficient Merkle tree with witnessing of marked leaves, checkpointing & state restoration." version = "0.4.0" authors = [ "Kris Nuttycombe ", ] -edition = "2021" -rust-version = "1.60" -license = "MIT OR Apache-2.0" -description = "A space-efficient Merkle tree with witnessing of marked leaves, checkpointing & state restoration." -homepage = "https://github.com/zcash/incrementalmerkletree" -repository = "https://github.com/zcash/incrementalmerkletree" -categories = ["algorithms", "data-structures"] +edition.workspace = true +rust-version.workspace = true +license.workspace = true +homepage.workspace = true +repository.workspace = true +categories.workspace = true [package.metadata.docs.rs] all-features = true @@ -20,14 +20,14 @@ rustdoc-args = ["--cfg", "docsrs"] assert_matches = { version = "1.5", optional = true } bitflags = "2" either = "1.8" -incrementalmerkletree = { version = "0.6", path = "../incrementalmerkletree" } -proptest = { version = "1.0.0", optional = true } +incrementalmerkletree.workspace = true +proptest = { workspace = true, optional = true } tracing = "0.1" [dev-dependencies] assert_matches = "1.5" -incrementalmerkletree = { version = "0.6", path = "../incrementalmerkletree", features = ["test-dependencies"] } -proptest = "1.0.0" +incrementalmerkletree = { workspace = true, features = ["test-dependencies"] } +proptest.workspace = true [features] # The legacy-api feature guards types and functions that are useful for