From c5fffc5b611eeb21387905306954f0f81e568a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Tue, 18 Jul 2023 14:18:46 -0700 Subject: [PATCH 01/10] Workspace properties changed in-place --- Cargo.toml | 26 +++++++++++++++++--------- crates/allocator/Cargo.toml | 14 +++++++------- crates/e2e/Cargo.toml | 16 ++++++++-------- crates/e2e/macro/Cargo.toml | 16 ++++++++-------- crates/engine/Cargo.toml | 14 +++++++------- crates/env/Cargo.toml | 14 +++++++------- crates/ink/Cargo.toml | 14 +++++++------- crates/ink/codegen/Cargo.toml | 14 +++++++------- crates/ink/ir/Cargo.toml | 14 +++++++------- crates/ink/macro/Cargo.toml | 14 +++++++------- crates/metadata/Cargo.toml | 14 +++++++------- crates/prelude/Cargo.toml | 14 +++++++------- crates/primitives/Cargo.toml | 14 +++++++------- crates/storage/Cargo.toml | 14 +++++++------- crates/storage/traits/Cargo.toml | 16 ++++++++-------- 15 files changed, 118 insertions(+), 110 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5fbf111385..412857449d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,27 +1,35 @@ [workspace] resolver = "2" members = [ - "crates/ink", - "crates/metadata", "crates/allocator", + "crates/e2e", + "crates/e2e/macro", + "crates/engine", + "crates/env", "crates/ink", - "crates/ink/macro", - "crates/ink/ir", "crates/ink/codegen", + "crates/ink/ir", "crates/ink/macro", + "crates/metadata", "crates/prelude", "crates/primitives", - "crates/e2e", - "crates/e2e/macro", - "crates/engine", - "crates/env", "crates/storage", "crates/storage/traits", ] exclude = [ - "integration-tests/", + "integration-tests", ] +[workspace.package] +authors = ["Parity Technologies "] +categories = ["no-std", "embedded"] +edition = "2021" +homepage = "https://www.parity.io/" +keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] +license = "Apache-2.0" +repository = "https://github.com/paritytech/ink" +version = "4.2.0" + [profile.release] panic = "abort" lto = true diff --git a/crates/allocator/Cargo.toml b/crates/allocator/Cargo.toml index 5186baad1e..6e7bd9ea94 100644 --- a/crates/allocator/Cargo.toml +++ b/crates/allocator/Cargo.toml @@ -1,17 +1,17 @@ [package] name = "ink_allocator" -version = "4.2.0" +version.workspace = true authors = ["Parity Technologies ", "Robin Freyler "] -edition = "2021" +edition.workspace = true -license = "Apache-2.0" +license.workspace = true readme = "README.md" -repository = "https://github.com/paritytech/ink" +repository.workspace = true documentation = "https://docs.rs/ink_allocator/" -homepage = "https://www.parity.io/" +homepage.workspace = true description = "[ink!] Bindings to the Wasm heap memory allocator." -keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] -categories = ["no-std", "embedded"] +keywords.workspace = true +categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml index 895766cb66..9aa6f53bff 100644 --- a/crates/e2e/Cargo.toml +++ b/crates/e2e/Cargo.toml @@ -1,17 +1,17 @@ [package] name = "ink_e2e" -version = "4.2.0" -authors = ["Parity Technologies "] -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true -license = "Apache-2.0" +license.workspace = true readme = "README.md" -repository = "https://github.com/paritytech/ink" +repository.workspace = true documentation = "https://docs.rs/ink_e2e/" -homepage = "https://www.parity.io/" +homepage.workspace = true description = "[ink!] End-to-end testing framework for smart contracts." -keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] -categories = ["no-std", "embedded"] +keywords.workspace = true +categories.workspace = true include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"] [dependencies] diff --git a/crates/e2e/macro/Cargo.toml b/crates/e2e/macro/Cargo.toml index 1532d953ca..146372a9be 100644 --- a/crates/e2e/macro/Cargo.toml +++ b/crates/e2e/macro/Cargo.toml @@ -1,17 +1,17 @@ [package] name = "ink_e2e_macro" -version = "4.2.0" -authors = ["Parity Technologies "] -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true -license = "Apache-2.0" +license.workspace = true readme = "../README.md" -repository = "https://github.com/paritytech/ink" +repository.workspace = true documentation = "https://docs.rs/ink_macro/" -homepage = "https://www.parity.io/" +homepage.workspace = true description = "[ink!] Macro for generating end-to-end tests" -keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] -categories = ["no-std", "embedded"] +keywords.workspace = true +categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [lib] diff --git a/crates/engine/Cargo.toml b/crates/engine/Cargo.toml index fe248d80fc..0aa0f13238 100644 --- a/crates/engine/Cargo.toml +++ b/crates/engine/Cargo.toml @@ -1,17 +1,17 @@ [package] name = "ink_engine" -version = "4.2.0" +version.workspace = true authors = ["Parity Technologies ", "Michael Müller "] -edition = "2021" +edition.workspace = true -license = "Apache-2.0" +license.workspace = true readme = "README.md" -repository = "https://github.com/paritytech/ink" +repository.workspace = true documentation = "https://docs.rs/ink_engine/" -homepage = "https://www.parity.io/" +homepage.workspace = true description = "[ink!] Off-chain environment for testing." -keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] -categories = ["no-std", "embedded"] +keywords.workspace = true +categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] diff --git a/crates/env/Cargo.toml b/crates/env/Cargo.toml index 5c5e815b39..e95233aa2a 100644 --- a/crates/env/Cargo.toml +++ b/crates/env/Cargo.toml @@ -1,18 +1,18 @@ [package] name = "ink_env" -version = "4.2.0" +version.workspace = true authors = ["Parity Technologies ", "Robin Freyler "] -edition = "2021" +edition.workspace = true rust-version = "1.68" -license = "Apache-2.0" +license.workspace = true readme = "README.md" -repository = "https://github.com/paritytech/ink" +repository.workspace = true documentation = "https://docs.rs/ink_env/" -homepage = "https://www.parity.io/" +homepage.workspace = true description = "[ink!] Low-level interface for interacting with the smart contract Wasm executor." -keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] -categories = ["no-std", "embedded"] +keywords.workspace = true +categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] diff --git a/crates/ink/Cargo.toml b/crates/ink/Cargo.toml index ec3b03ce13..fd56c19bca 100644 --- a/crates/ink/Cargo.toml +++ b/crates/ink/Cargo.toml @@ -1,18 +1,18 @@ [package] name = "ink" -version = "4.2.0" +version.workspace = true authors = ["Parity Technologies ", "Robin Freyler "] -edition = "2021" +edition.workspace = true rust-version = "1.63" -license = "Apache-2.0" +license.workspace = true readme = "README.md" -repository = "https://github.com/paritytech/ink" +repository.workspace = true documentation = "https://docs.rs/ink" -homepage = "https://www.parity.io/" +homepage.workspace = true description = "[ink!] Rust based eDSL for writing smart contracts for Substrate" -keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] -categories = ["no-std", "embedded"] +keywords.workspace = true +categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] diff --git a/crates/ink/codegen/Cargo.toml b/crates/ink/codegen/Cargo.toml index af97d0236e..71b3b776b8 100644 --- a/crates/ink/codegen/Cargo.toml +++ b/crates/ink/codegen/Cargo.toml @@ -1,17 +1,17 @@ [package] name = "ink_codegen" -version = "4.2.0" +version.workspace = true authors = ["Parity Technologies ", "Robin Freyler "] -edition = "2021" +edition.workspace = true -license = "Apache-2.0" +license.workspace = true readme = "README.md" -repository = "https://github.com/paritytech/ink" +repository.workspace = true documentation = "https://docs.rs/ink_codegen/" -homepage = "https://www.parity.io/" +homepage.workspace = true description = "data structures and algorithms for generating ink! IR code" -keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] -categories = ["no-std", "embedded"] +keywords.workspace = true +categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [lib] diff --git a/crates/ink/ir/Cargo.toml b/crates/ink/ir/Cargo.toml index 9c428af1e2..1e80fd1aa3 100644 --- a/crates/ink/ir/Cargo.toml +++ b/crates/ink/ir/Cargo.toml @@ -1,17 +1,17 @@ [package] name = "ink_ir" -version = "4.2.0" +version.workspace = true authors = ["Parity Technologies ", "Robin Freyler "] -edition = "2021" +edition.workspace = true -license = "Apache-2.0" +license.workspace = true readme = "README.md" -repository = "https://github.com/paritytech/ink" +repository.workspace = true documentation = "https://docs.rs/ink_ir/" -homepage = "https://www.parity.io/" +homepage.workspace = true description = "data structures and algorithms for ink! intermediate representation" -keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] -categories = ["no-std", "embedded"] +keywords.workspace = true +categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [lib] diff --git a/crates/ink/macro/Cargo.toml b/crates/ink/macro/Cargo.toml index d88da585d5..8062a8b7ac 100644 --- a/crates/ink/macro/Cargo.toml +++ b/crates/ink/macro/Cargo.toml @@ -1,17 +1,17 @@ [package] name = "ink_macro" -version = "4.2.0" +version.workspace = true authors = ["Parity Technologies ", "Robin Freyler "] -edition = "2021" +edition.workspace = true -license = "Apache-2.0" +license.workspace = true readme = "README.md" -repository = "https://github.com/paritytech/ink" +repository.workspace = true documentation = "https://docs.rs/ink_macro/" -homepage = "https://www.parity.io/" +homepage.workspace = true description = "[ink!] Rust based eDSL for writing smart contracts for Substrate" -keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] -categories = ["no-std", "embedded"] +keywords.workspace = true +categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] diff --git a/crates/metadata/Cargo.toml b/crates/metadata/Cargo.toml index 333f03ece3..f0a25327c8 100644 --- a/crates/metadata/Cargo.toml +++ b/crates/metadata/Cargo.toml @@ -1,17 +1,17 @@ [package] name = "ink_metadata" -version = "4.2.0" +version.workspace = true authors = ["Parity Technologies ", "Robin Freyler "] -edition = "2021" +edition.workspace = true -license = "Apache-2.0" +license.workspace = true readme = "README.md" -repository = "https://github.com/paritytech/ink" +repository.workspace = true documentation = "https://docs.rs/ink_metadata/" -homepage = "https://www.parity.io/" +homepage.workspace = true description = "[ink!] Metadata definitions for ink! smart contracts." -keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] -categories = ["no-std", "embedded"] +keywords.workspace = true +categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] diff --git a/crates/prelude/Cargo.toml b/crates/prelude/Cargo.toml index 7c5f88bedf..c233ad7b49 100644 --- a/crates/prelude/Cargo.toml +++ b/crates/prelude/Cargo.toml @@ -1,17 +1,17 @@ [package] name = "ink_prelude" -version = "4.2.0" +version.workspace = true authors = ["Parity Technologies ", "Robin Freyler "] -edition = "2021" +edition.workspace = true -license = "Apache-2.0" +license.workspace = true readme = "README.md" -repository = "https://github.com/paritytech/ink" +repository.workspace = true documentation = "https://docs.rs/ink_prelude/" -homepage = "https://www.parity.io/" +homepage.workspace = true description = "[ink!] Common API for no_std and std to access alloc crate types." -keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] -categories = ["no-std", "embedded"] +keywords.workspace = true +categories.workspace = true include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"] [dependencies] diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index b1b11153c6..d1ab6cffc5 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -1,17 +1,17 @@ [package] name = "ink_primitives" -version = "4.2.0" +version.workspace = true authors = ["Parity Technologies ", "Robin Freyler "] -edition = "2021" +edition.workspace = true -license = "Apache-2.0" +license.workspace = true readme = "README.md" -repository = "https://github.com/paritytech/ink" +repository.workspace = true documentation = "https://docs.rs/ink_primitives/" -homepage = "https://www.parity.io/" +homepage.workspace = true description = "[ink!] Fundamental primitive types for ink! smart contracts." -keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] -categories = ["no-std", "embedded"] +keywords.workspace = true +categories.workspace = true include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"] [dependencies] diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index 56024bb602..dbb150d21f 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -1,17 +1,17 @@ [package] name = "ink_storage" -version = "4.2.0" +version.workspace = true authors = ["Parity Technologies ", "Robin Freyler "] -edition = "2021" +edition.workspace = true -license = "Apache-2.0" +license.workspace = true readme = "README.md" -repository = "https://github.com/paritytech/ink" +repository.workspace = true documentation = "https://docs.rs/ink_storage/" -homepage = "https://www.parity.io/" +homepage.workspace = true description = "[ink!] Data structures to organize and manipulate ink! contract storage." -keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] -categories = ["no-std", "embedded"] +keywords.workspace = true +categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] diff --git a/crates/storage/traits/Cargo.toml b/crates/storage/traits/Cargo.toml index 04d760be29..90c7641de6 100644 --- a/crates/storage/traits/Cargo.toml +++ b/crates/storage/traits/Cargo.toml @@ -1,17 +1,17 @@ [package] name = "ink_storage_traits" -version = "4.2.0" -authors = ["Parity Technologies "] -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true -license = "Apache-2.0" +license.workspace = true readme = "../README.md" -repository = "https://github.com/paritytech/ink" +repository.workspace = true documentation = "https://docs.rs/ink_storage_traits" -homepage = "https://www.parity.io/" +homepage.workspace = true description = "[ink!] defines traits for using ink storage." -keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"] -categories = ["no-std", "embedded"] +keywords.workspace = true +categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] From 226d634fc19bc222e27827e9a9ed87fc637bf741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Tue, 18 Jul 2023 14:46:28 -0700 Subject: [PATCH 02/10] Workspace dependencies changed in-place --- Cargo.toml | 64 ++++++++++++++++++++++++++++++++ crates/allocator/Cargo.toml | 6 +-- crates/e2e/Cargo.toml | 38 +++++++++---------- crates/e2e/macro/Cargo.toml | 20 +++++----- crates/engine/Cargo.toml | 12 +++--- crates/env/Cargo.toml | 36 +++++++++--------- crates/ink/Cargo.toml | 22 +++++------ crates/ink/codegen/Cargo.toml | 24 ++++++------ crates/ink/ir/Cargo.toml | 14 +++---- crates/ink/macro/Cargo.toml | 26 ++++++------- crates/metadata/Cargo.toml | 14 +++---- crates/prelude/Cargo.toml | 2 +- crates/primitives/Cargo.toml | 12 +++--- crates/storage/Cargo.toml | 26 ++++++------- crates/storage/traits/Cargo.toml | 10 ++--- 15 files changed, 195 insertions(+), 131 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 412857449d..5b9366bf1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,6 +30,70 @@ license = "Apache-2.0" repository = "https://github.com/paritytech/ink" version = "4.2.0" +[workspace.dependencies] +arrayref = { version = "0.3" } +array-init = { version = "2.0", default-features = false } +blake2 = { version = "0.10" } +cargo_metadata = { version = "0.15.3" } +cfg-if = { version = "1.0" } +contract-build = { version = "3.0.0" } +derive_more = { version = "0.99.17", default-features = false } +either = { version = "1.5", default-features = false } +funty = { version = "2.0.0" } +heck = { version = "0.4.0" } +impl-serde = { version = "0.4.0", default-features = false } +itertools = { version = "0.11", default-features = false } +jsonrpsee = { version = "0.18.0" } +num-traits = { version = "0.2", default-features = false } +paste = { version = "1.0" } +pretty_assertions = { version = "1" } +proc-macro2 = { version = "1" } +quickcheck = { version = "1" } +quickcheck_macros = { version = "1" } +quote = { version = "1" } +rlibc = { version = "1" } +scale-decode = { version = "0.7.0", default-features = false } +scale-encode = { version = "0.3.0", default-features = false } +scale-info = { version = "2.6", default-features = false } +schemars = { version = "0.8" } +secp256k1 = { version = "0.27.0" } +serde = { version = "1.0.137", default-features = false } +serde_json = { version = "1.0.81" } +sha2 = { version = "0.10" } +sha3 = { version = "0.10" } +static_assertions = { version = "1.1" } +subxt = { version = "0.29.0" } +syn = { version = "2" } +synstructure = { version = "0.13.0" } +tokio = { version = "1.18.2" } +tracing = { version = "0.1.37" } +tracing-subscriber = { version = "0.3.17" } +trybuild = { version = "1.0.60" } +which = { version = "4.4.0" } +xxhash-rust = { version = "0.8" } + +# Substrate dependencies +pallet-contracts-primitives = { version = "24.0.0", default-features = false } +sp-core = { version = "21.0.0", default-features = false } +sp-keyring = { version = "24.0.0", default-features = false } +sp-runtime = { version = "24.0.0", default-features = false } +sp-weights = { version = "20.0.0", default-features = false } + +# Local dependencies +ink = { version = "4.2.0", path = "crates/ink", default-features = false } +ink_allocator = { version = "4.2.0", path = "crates/allocator", default-features = false } +ink_codegen = { version = "4.2.0", path = "crates/ink/codegen", default-features = false } +ink_e2e_macro = { version = "4.2.0", path = "crates/e2e/macro", default-features = false } +ink_engine = { version = "4.2.0", path = "crates/engine", default-features = false } +ink_env = { version = "4.2.0", path = "crates/env", default-features = false } +ink_ir = { version = "4.2.0", path = "crates/ink/ir", default-features = false } +ink_macro = { version = "4.2.0", path = "crates/ink/macro", default-features = false } +ink_metadata = { version = "4.2.0", path = "crates/metadata", default-features = false } +ink_prelude = { version = "4.2.0", path = "crates/prelude", default-features = false } +ink_primitives = { version = "4.2.0", path = "crates/primitives", default-features = false } +ink_storage = { version = "4.2.0", path = "crates/storage", default-features = false } +ink_storage_traits = { version = "4.2.0", path = "crates/storage/traits", default-features = false } + [profile.release] panic = "abort" lto = true diff --git a/crates/allocator/Cargo.toml b/crates/allocator/Cargo.toml index 6e7bd9ea94..a63e847a67 100644 --- a/crates/allocator/Cargo.toml +++ b/crates/allocator/Cargo.toml @@ -15,11 +15,11 @@ categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -cfg-if = "1.0" +cfg-if = { workspace = true } [dev-dependencies] -quickcheck = "1" -quickcheck_macros = "1" +quickcheck = { workspace = true } +quickcheck_macros = { workspace = true } [features] default = ["std"] diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml index 9aa6f53bff..8b1e19de70 100644 --- a/crates/e2e/Cargo.toml +++ b/crates/e2e/Cargo.toml @@ -15,32 +15,32 @@ categories.workspace = true include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"] [dependencies] -ink_e2e_macro = { version = "=4.2.0", path = "./macro" } -ink = { version = "=4.2.0", path = "../ink" } -ink_env = { version = "=4.2.0", path = "../env" } -ink_primitives = { version = "=4.2.0", path = "../primitives" } +ink_e2e_macro = { workspace = true } +ink = { workspace = true } +ink_env = { workspace = true } +ink_primitives = { workspace = true } -funty = "2.0.0" -impl-serde = { version = "0.4.0", default-features = false } -jsonrpsee = { version = "0.18.0", features = ["ws-client"] } -serde = { version = "1.0.137", default-features = false, features = ["derive"] } -serde_json = { version = "1.0.81" } -tokio = { version = "1.18.2", features = ["rt-multi-thread"] } -tracing = "0.1.37" -tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } +funty = { workspace = true } +impl-serde = { workspace = true } +jsonrpsee = { workspace = true, features = ["ws-client"] } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } +tokio = { workspace = true, features = ["rt-multi-thread"] } +tracing = { workspace = true } +tracing-subscriber = { workspace = true, features = ["env-filter"] } scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } -subxt = "0.29.0" +subxt = { workspace = true } # Substrate -pallet-contracts-primitives = "24.0.0" -sp-core = { version = "21.0.0", default-features = false } -sp-keyring = "24.0.0" -sp-runtime = "24.0.0" -sp-weights = "20.0.0" +pallet-contracts-primitives = { workspace = true } +sp-core = { workspace = true } +sp-keyring = { workspace = true } +sp-runtime = { workspace = true } +sp-weights = { workspace = true } [dev-dependencies] # Required for the doctest of `MessageBuilder::call` -scale-info = { version = "2.6", default-features = false, features = ["derive"] } +scale-info = { workspace = true, features = ["derive"] } [features] default = ["std"] diff --git a/crates/e2e/macro/Cargo.toml b/crates/e2e/macro/Cargo.toml index 146372a9be..570b35e4cd 100644 --- a/crates/e2e/macro/Cargo.toml +++ b/crates/e2e/macro/Cargo.toml @@ -19,13 +19,13 @@ name = "ink_e2e_macro" proc-macro = true [dependencies] -ink_ir = { version = "=4.2.0", path = "../../ink/ir" } -cargo_metadata = "0.15.3" -contract-build = "3.0.0" -derive_more = "0.99.17" -tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } -serde_json = "1.0.89" -syn = "2" -proc-macro2 = "1" -quote = "1" -which = "4.4.0" +ink_ir = { workspace = true } +cargo_metadata = { workspace = true } +contract-build = { workspace = true } +derive_more = { workspace = true } +tracing-subscriber = { workspace = true, features = ["env-filter"] } +serde_json = { workspace = true } +syn = { workspace = true } +proc-macro2 = { workspace = true } +quote = { workspace = true } +which = { workspace = true } diff --git a/crates/engine/Cargo.toml b/crates/engine/Cargo.toml index 0aa0f13238..191dd2d5e1 100644 --- a/crates/engine/Cargo.toml +++ b/crates/engine/Cargo.toml @@ -15,16 +15,16 @@ categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -ink_primitives = { version = "=4.2.0", path = "../../crates/primitives", default-features = false } +ink_primitives = { workspace = true } scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } -derive_more = { version = "0.99", default-features = false, features = ["from", "display"] } +derive_more = { workspace = true, features = ["from", "display"] } -sha2 = { version = "0.10" } -sha3 = { version = "0.10" } -blake2 = { version = "0.10" } +sha2 = { workspace = true } +sha3 = { workspace = true } +blake2 = { workspace = true } # ECDSA for the off-chain environment. -secp256k1 = { version = "0.27.0", features = ["recovery", "global-context"], optional = true } +secp256k1 = { workspace = true, features = ["recovery", "global-context"], optional = true } [features] default = ["std"] diff --git a/crates/env/Cargo.toml b/crates/env/Cargo.toml index e95233aa2a..2811e218ac 100644 --- a/crates/env/Cargo.toml +++ b/crates/env/Cargo.toml @@ -16,18 +16,18 @@ categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -ink_allocator = { version = "=4.2.0", path = "../allocator", default-features = false } -ink_storage_traits = { version = "=4.2.0", path = "../storage/traits", default-features = false } -ink_prelude = { version = "=4.2.0", path = "../prelude", default-features = false } -ink_primitives = { version = "=4.2.0", path = "../primitives", default-features = false } +ink_allocator = { workspace = true } +ink_storage_traits = { workspace = true } +ink_prelude = { workspace = true } +ink_primitives = { workspace = true } scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } -derive_more = { version = "0.99", default-features = false, features = ["from", "display"] } -num-traits = { version = "0.2", default-features = false, features = ["i128"] } -cfg-if = "1.0" -paste = "1.0" -arrayref = "0.3" -static_assertions = "1.1" +derive_more = { workspace = true, features = ["from", "display"] } +num-traits = { workspace = true, features = ["i128"] } +cfg-if = { workspace = true } +paste = { workspace = true } +arrayref = { workspace = true } +static_assertions = { workspace = true } [target.'cfg(target_arch = "wasm32")'.dependencies] rlibc = "1" @@ -36,23 +36,23 @@ rlibc = "1" ink_engine = { version = "=4.2.0", path = "../engine/", optional = true } # Hashes for the off-chain environment. -sha2 = { version = "0.10", optional = true } -sha3 = { version = "0.10", optional = true } -blake2 = { version = "0.10", optional = true } +sha2 = { workspace = true, optional = true } +sha3 = { workspace = true, optional = true } +blake2 = { workspace = true, optional = true } # ECDSA for the off-chain environment. -secp256k1 = { version = "0.27.0", features = ["recovery", "global-context"], optional = true } +secp256k1 = { workspace = true, features = ["recovery", "global-context"], optional = true } # Only used in the off-chain environment. # # Sadly couldn't be marked as dev-dependency. # Never use this crate outside the off-chain environment! -scale-decode = { version = "0.7.0", default-features = false, optional = true } -scale-encode = { version = "0.3.0", default-features = false, optional = true } -scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true } +scale-decode = { workspace = true, optional = true } +scale-encode = { workspace = true, optional = true } +scale-info = { workspace = true, features = ["derive"], optional = true } [dev-dependencies] -ink = { path = "../ink" } +ink = { workspace = true } [features] default = ["std"] diff --git a/crates/ink/Cargo.toml b/crates/ink/Cargo.toml index fd56c19bca..2912851cc3 100644 --- a/crates/ink/Cargo.toml +++ b/crates/ink/Cargo.toml @@ -16,23 +16,23 @@ categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -ink_env = { version = "=4.2.0", path = "../env", default-features = false } -ink_storage = { version = "=4.2.0", path = "../storage", default-features = false } -ink_primitives = { version = "=4.2.0", path = "../primitives", default-features = false } -ink_metadata = { version = "=4.2.0", path = "../metadata", default-features = false, optional = true } -ink_prelude = { version = "=4.2.0", path = "../prelude", default-features = false } -ink_macro = { version = "=4.2.0", path = "macro", default-features = false } +ink_env = { workspace = true } +ink_storage = { workspace = true } +ink_primitives = { workspace = true } +ink_metadata = { workspace = true, optional = true } +ink_prelude = { workspace = true } +ink_macro = { workspace = true } scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } -derive_more = { version = "0.99", default-features = false, features = ["from"] } +derive_more = { workspace = true, features = ["from"] } [dev-dependencies] -ink_ir = { path = "./ir" } -ink_metadata = { path = "../metadata", default-features = false } +ink_ir = { workspace = true } +ink_metadata = { workspace = true } -trybuild = { version = "1.0.60", features = ["diff"] } +trybuild = { workspace = true, features = ["diff"] } # Required for the doctest of `env_access::EnvAccess::instantiate_contract` -scale-info = { version = "2.6", default-features = false, features = ["derive"] } +scale-info = { workspace = true, features = ["derive"] } [features] default = ["std"] diff --git a/crates/ink/codegen/Cargo.toml b/crates/ink/codegen/Cargo.toml index 71b3b776b8..72b32d2054 100644 --- a/crates/ink/codegen/Cargo.toml +++ b/crates/ink/codegen/Cargo.toml @@ -18,21 +18,21 @@ include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] name = "ink_codegen" [dependencies] -ink_primitives = { version = "=4.2.0", path = "../../primitives" } +ink_primitives = { workspace = true } ir = { version = "=4.2.0", package = "ink_ir", path = "../ir", default-features = false } -quote = "1" -syn = { version = "2.0", features = ["parsing", "full", "extra-traits"] } -proc-macro2 = "1.0" -derive_more = { version = "0.99", default-features = false, features = ["from"] } -itertools = "0.11" -either = { version = "1.5", default-features = false } -blake2 = "0.10" -heck = "0.4.0" +quote = { workspace = true } +syn = { workspace = true, features = ["parsing", "full", "extra-traits"] } +proc-macro2 = { workspace = true } +derive_more = { workspace = true, features = ["from"] } +itertools = { workspace = true } +either = { workspace = true } +blake2 = { workspace = true } +heck = { workspace = true } scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } -impl-serde = "0.4.0" +impl-serde = { workspace = true } -serde = { version = "1.0.137", default-features = false, features = ["derive"] } -serde_json = "1.0.81" +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } [features] default = ["std"] diff --git a/crates/ink/ir/Cargo.toml b/crates/ink/ir/Cargo.toml index 1e80fd1aa3..74fe25698b 100644 --- a/crates/ink/ir/Cargo.toml +++ b/crates/ink/ir/Cargo.toml @@ -18,13 +18,13 @@ include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] name = "ink_ir" [dependencies] -quote = "1" -syn = { version = "2.0", features = ["parsing", "full", "visit", "extra-traits"] } -proc-macro2 = "1.0" -itertools = { version = "0.11", default-features = false } -either = { version = "1.5", default-features = false } -blake2 = "0.10" -ink_prelude = { version = "4.1.0", path = "../../prelude/", default-features = false } +quote = { workspace = true } +syn = { workspace = true, features = ["parsing", "full", "visit", "extra-traits"] } +proc-macro2 = { workspace = true } +itertools = { workspace = true } +either = { workspace = true } +blake2 = { workspace = true } +ink_prelude = { workspace = true } [features] default = ["std"] diff --git a/crates/ink/macro/Cargo.toml b/crates/ink/macro/Cargo.toml index 8062a8b7ac..0b5dae55cc 100644 --- a/crates/ink/macro/Cargo.toml +++ b/crates/ink/macro/Cargo.toml @@ -15,23 +15,23 @@ categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -ink_ir = { version = "=4.2.0", path = "../ir", default-features = false } -ink_codegen = { version = "=4.2.0", path = "../codegen", default-features = false } -ink_primitives = { version = "=4.2.0", path = "../../primitives/", default-features = false } +ink_ir = { workspace = true } +ink_codegen = { workspace = true } +ink_primitives = { workspace = true } scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } -syn = "2" -synstructure = "0.13.0" -proc-macro2 = "1" -quote = "1" +syn = { workspace = true } +synstructure = { workspace = true } +proc-macro2 = { workspace = true } +quote = { workspace = true } [dev-dependencies] -ink_env = { path = "../../env" } -ink = { path = ".." } -ink_metadata = { path = "../../metadata" } -ink_prelude = { path = "../../prelude" } -ink_storage = { path = "../../storage" } -scale-info = { version = "2.6", default-features = false, features = ["derive"] } +ink_env = { workspace = true } +ink = { workspace = true } +ink_metadata = { workspace = true } +ink_prelude = { workspace = true } +ink_storage = { workspace = true } +scale-info = { workspace = true } [lib] name = "ink_macro" diff --git a/crates/metadata/Cargo.toml b/crates/metadata/Cargo.toml index f0a25327c8..73a29bf417 100644 --- a/crates/metadata/Cargo.toml +++ b/crates/metadata/Cargo.toml @@ -15,14 +15,14 @@ categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -ink_prelude = { version = "=4.2.0", path = "../prelude/", default-features = false } -ink_primitives = { version = "=4.2.0", path = "../primitives/", default-features = false } +ink_prelude = { workspace = true } +ink_primitives = { workspace = true } -serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] } -impl-serde = "0.4.0" -derive_more = { version = "0.99", default-features = false, features = ["from"] } -scale-info = { version = "2.6", default-features = false, features = ["derive", "serde", "decode", "schema"] } -schemars = "0.8" +serde = { workspace = true, features = ["derive", "alloc"] } +impl-serde = { workspace = true } +derive_more = { workspace = true, features = ["from"] } +scale-info = { workspace = true, features = ["derive", "serde", "decode", "schema"] } +schemars = { workspace = true } [dev-dependencies] pretty_assertions = "1" diff --git a/crates/prelude/Cargo.toml b/crates/prelude/Cargo.toml index c233ad7b49..563abd92bb 100644 --- a/crates/prelude/Cargo.toml +++ b/crates/prelude/Cargo.toml @@ -15,7 +15,7 @@ categories.workspace = true include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"] [dependencies] -cfg-if = "1.0" +cfg-if = { workspace = true } [features] default = ["std"] diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index d1ab6cffc5..f6b4264039 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -15,13 +15,13 @@ categories.workspace = true include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"] [dependencies] -derive_more = { version = "0.99", default-features = false, features = ["from", "display"] } -ink_prelude = { version = "=4.2.0", path = "../prelude/", default-features = false } +derive_more = { workspace = true, features = ["from", "display"] } +ink_prelude = { workspace = true } scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } -scale-decode = { version = "0.7.0", default-features = false, features = ["derive"], optional = true } -scale-encode = { version = "0.3.0", default-features = false, features = ["derive"], optional = true } -scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true } -xxhash-rust = { version = "0.8", features = ["const_xxh32"] } +scale-decode = { workspace = true, features = ["derive"], optional = true } +scale-encode = { workspace = true, features = ["derive"], optional = true } +scale-info = { workspace = true, features = ["derive"], optional = true } +xxhash-rust = { workspace = true, features = ["const_xxh32"] } [features] default = ["std"] diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index dbb150d21f..e3457e35d9 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -15,24 +15,24 @@ categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -ink_env = { version = "=4.2.0", path = "../env/", default-features = false } -ink_metadata = { version = "=4.2.0", path = "../metadata/", default-features = false, features = ["derive"], optional = true } -ink_primitives = { version = "=4.2.0", path = "../primitives/", default-features = false } -ink_storage_traits = { version = "=4.2.0", path = "traits", default-features = false } -ink_prelude = { version = "=4.2.0", path = "../prelude/", default-features = false } +ink_env = { workspace = true } +ink_metadata = { workspace = true, optional = true } +ink_primitives = { workspace = true } +ink_storage_traits = { workspace = true } +ink_prelude = { workspace = true } scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } -derive_more = { version = "0.99", default-features = false, features = ["from", "display"] } -scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true } -cfg-if = "1.0" -array-init = { version = "2.0", default-features = false } +derive_more = { workspace = true, features = ["from", "display"] } +scale-info = { workspace = true, features = ["derive"], optional = true } +cfg-if = { workspace = true } +array-init = { workspace = true } [dev-dependencies] -quickcheck = "1.0" -quickcheck_macros = "1.0" -itertools = "0.11" +quickcheck = { workspace = true } +quickcheck_macros = { workspace = true } +itertools = { workspace = true } -ink = { path = "../ink" } +ink = { workspace = true } [features] default = ["std"] diff --git a/crates/storage/traits/Cargo.toml b/crates/storage/traits/Cargo.toml index 90c7641de6..c55b9a1482 100644 --- a/crates/storage/traits/Cargo.toml +++ b/crates/storage/traits/Cargo.toml @@ -15,14 +15,14 @@ categories.workspace = true include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] -ink_metadata = { version = "=4.2.0", path = "../../metadata", default-features = false, features = ["derive"], optional = true } -ink_primitives = { version = "=4.2.0", path = "../../primitives", default-features = false } -ink_prelude = { version = "=4.2.0", path = "../../prelude", default-features = false } +ink_metadata = { workspace = true, features = ["derive"], optional = true } +ink_primitives = { workspace = true } +ink_prelude = { workspace = true } scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } -scale-info = { version = "2.6", default-features = false, features = ["derive"], optional = true } +scale-info = { workspace = true, features = ["derive"], optional = true } [dev-dependencies] -paste = "1.0" +paste = { workspace = true } [features] default = ["std"] From 557b6faa5f8b08e5c1df6c945e2dc585421a7ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Tue, 18 Jul 2023 14:56:42 -0700 Subject: [PATCH 03/10] , default-features = true --- crates/e2e/Cargo.toml | 8 ++++---- crates/e2e/macro/Cargo.toml | 4 ++-- crates/env/Cargo.toml | 2 +- crates/ink/Cargo.toml | 2 +- crates/ink/codegen/Cargo.toml | 2 +- crates/ink/macro/Cargo.toml | 12 ++++++------ crates/metadata/Cargo.toml | 2 +- crates/storage/Cargo.toml | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml index 8b1e19de70..58ab079ea0 100644 --- a/crates/e2e/Cargo.toml +++ b/crates/e2e/Cargo.toml @@ -15,10 +15,10 @@ categories.workspace = true include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"] [dependencies] -ink_e2e_macro = { workspace = true } -ink = { workspace = true } -ink_env = { workspace = true } -ink_primitives = { workspace = true } +ink_e2e_macro = { workspace = true, default-features = true } +ink = { workspace = true, default-features = true } +ink_env = { workspace = true, default-features = true } +ink_primitives = { workspace = true, default-features = true } funty = { workspace = true } impl-serde = { workspace = true } diff --git a/crates/e2e/macro/Cargo.toml b/crates/e2e/macro/Cargo.toml index 570b35e4cd..93102e2ac5 100644 --- a/crates/e2e/macro/Cargo.toml +++ b/crates/e2e/macro/Cargo.toml @@ -19,10 +19,10 @@ name = "ink_e2e_macro" proc-macro = true [dependencies] -ink_ir = { workspace = true } +ink_ir = { workspace = true, default-features = true } cargo_metadata = { workspace = true } contract-build = { workspace = true } -derive_more = { workspace = true } +derive_more = { workspace = true, default-features = true } tracing-subscriber = { workspace = true, features = ["env-filter"] } serde_json = { workspace = true } syn = { workspace = true } diff --git a/crates/env/Cargo.toml b/crates/env/Cargo.toml index 2811e218ac..c30151a20d 100644 --- a/crates/env/Cargo.toml +++ b/crates/env/Cargo.toml @@ -33,7 +33,7 @@ static_assertions = { workspace = true } rlibc = "1" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -ink_engine = { version = "=4.2.0", path = "../engine/", optional = true } +ink_engine = { workspace = true, default-features = true, optional = true } # Hashes for the off-chain environment. sha2 = { workspace = true, optional = true } diff --git a/crates/ink/Cargo.toml b/crates/ink/Cargo.toml index 2912851cc3..9c49158557 100644 --- a/crates/ink/Cargo.toml +++ b/crates/ink/Cargo.toml @@ -27,7 +27,7 @@ scale = { package = "parity-scale-codec", version = "3.4", default-features = fa derive_more = { workspace = true, features = ["from"] } [dev-dependencies] -ink_ir = { workspace = true } +ink_ir = { workspace = true, default-features = true } ink_metadata = { workspace = true } trybuild = { workspace = true, features = ["diff"] } diff --git a/crates/ink/codegen/Cargo.toml b/crates/ink/codegen/Cargo.toml index 72b32d2054..837e0b1643 100644 --- a/crates/ink/codegen/Cargo.toml +++ b/crates/ink/codegen/Cargo.toml @@ -29,7 +29,7 @@ either = { workspace = true } blake2 = { workspace = true } heck = { workspace = true } scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } -impl-serde = { workspace = true } +impl-serde = { workspace = true, default-features = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } diff --git a/crates/ink/macro/Cargo.toml b/crates/ink/macro/Cargo.toml index 0b5dae55cc..418e8a3362 100644 --- a/crates/ink/macro/Cargo.toml +++ b/crates/ink/macro/Cargo.toml @@ -26,12 +26,12 @@ proc-macro2 = { workspace = true } quote = { workspace = true } [dev-dependencies] -ink_env = { workspace = true } -ink = { workspace = true } -ink_metadata = { workspace = true } -ink_prelude = { workspace = true } -ink_storage = { workspace = true } -scale-info = { workspace = true } +ink_env = { workspace = true, default-features = true } +ink = { workspace = true, default-features = true } +ink_metadata = { workspace = true, default-features = true } +ink_prelude = { workspace = true, default-features = true } +ink_storage = { workspace = true, default-features = true } +scale-info = { workspace = true, features = ["derive"] } [lib] name = "ink_macro" diff --git a/crates/metadata/Cargo.toml b/crates/metadata/Cargo.toml index 73a29bf417..1db20add83 100644 --- a/crates/metadata/Cargo.toml +++ b/crates/metadata/Cargo.toml @@ -19,7 +19,7 @@ ink_prelude = { workspace = true } ink_primitives = { workspace = true } serde = { workspace = true, features = ["derive", "alloc"] } -impl-serde = { workspace = true } +impl-serde = { workspace = true, default-features = true } derive_more = { workspace = true, features = ["from"] } scale-info = { workspace = true, features = ["derive", "serde", "decode", "schema"] } schemars = { workspace = true } diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index e3457e35d9..250b8ac51e 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -30,7 +30,7 @@ array-init = { workspace = true } [dev-dependencies] quickcheck = { workspace = true } quickcheck_macros = { workspace = true } -itertools = { workspace = true } +itertools = { workspace = true, default-features = true } ink = { workspace = true } From 370d82b60874d3534eaf87b30f5f269fc773d186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Tue, 18 Jul 2023 15:00:10 -0700 Subject: [PATCH 04/10] pin --- Cargo.toml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5b9366bf1d..d32371acfc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -80,19 +80,19 @@ sp-runtime = { version = "24.0.0", default-features = false } sp-weights = { version = "20.0.0", default-features = false } # Local dependencies -ink = { version = "4.2.0", path = "crates/ink", default-features = false } -ink_allocator = { version = "4.2.0", path = "crates/allocator", default-features = false } -ink_codegen = { version = "4.2.0", path = "crates/ink/codegen", default-features = false } -ink_e2e_macro = { version = "4.2.0", path = "crates/e2e/macro", default-features = false } -ink_engine = { version = "4.2.0", path = "crates/engine", default-features = false } +ink = { version = "=4.2.0", path = "crates/ink", default-features = false } +ink_allocator = { version = "=4.2.0", path = "crates/allocator", default-features = false } +ink_codegen = { version = "=4.2.0", path = "crates/ink/codegen", default-features = false } +ink_e2e_macro = { version = "=4.2.0", path = "crates/e2e/macro", default-features = false } +ink_engine = { version = "=4.2.0", path = "crates/engine", default-features = false } ink_env = { version = "4.2.0", path = "crates/env", default-features = false } ink_ir = { version = "4.2.0", path = "crates/ink/ir", default-features = false } -ink_macro = { version = "4.2.0", path = "crates/ink/macro", default-features = false } -ink_metadata = { version = "4.2.0", path = "crates/metadata", default-features = false } -ink_prelude = { version = "4.2.0", path = "crates/prelude", default-features = false } -ink_primitives = { version = "4.2.0", path = "crates/primitives", default-features = false } -ink_storage = { version = "4.2.0", path = "crates/storage", default-features = false } -ink_storage_traits = { version = "4.2.0", path = "crates/storage/traits", default-features = false } +ink_macro = { version = "=4.2.0", path = "crates/ink/macro", default-features = false } +ink_metadata = { version = "=4.2.0", path = "crates/metadata", default-features = false } +ink_prelude = { version = "=4.2.0", path = "crates/prelude", default-features = false } +ink_primitives = { version = "=4.2.0", path = "crates/primitives", default-features = false } +ink_storage = { version = "=4.2.0", path = "crates/storage", default-features = false } +ink_storage_traits = { version = "=4.2.0", path = "crates/storage/traits", default-features = false } [profile.release] panic = "abort" From 71c17df8d29fda10e0ea40c3142d09145fd59269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Tue, 18 Jul 2023 15:26:48 -0700 Subject: [PATCH 05/10] ui tests --- .../tests/ui/contract/fail/message-returns-non-codec.stderr | 2 +- .../tests/ui/trait_def/fail/message_output_non_codec.stderr | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/ink/tests/ui/contract/fail/message-returns-non-codec.stderr b/crates/ink/tests/ui/contract/fail/message-returns-non-codec.stderr index eecbabe13b..0dd6d58679 100644 --- a/crates/ink/tests/ui/contract/fail/message-returns-non-codec.stderr +++ b/crates/ink/tests/ui/contract/fail/message-returns-non-codec.stderr @@ -46,7 +46,7 @@ error[E0599]: the method `try_invoke` exists for struct `CallBuilder $CARGO/parity-scale-codec-3.6.3/src/codec.rs + --> $CARGO/parity-scale-codec-3.6.4/src/codec.rs | | pub trait Decode: Sized { | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/crates/ink/tests/ui/trait_def/fail/message_output_non_codec.stderr b/crates/ink/tests/ui/trait_def/fail/message_output_non_codec.stderr index 4306a056bf..df8688067f 100644 --- a/crates/ink/tests/ui/trait_def/fail/message_output_non_codec.stderr +++ b/crates/ink/tests/ui/trait_def/fail/message_output_non_codec.stderr @@ -35,7 +35,7 @@ error[E0599]: the method `try_invoke` exists for struct `CallBuilder $CARGO/parity-scale-codec-3.6.3/src/codec.rs + --> $CARGO/parity-scale-codec-3.6.4/src/codec.rs | | pub trait Decode: Sized { - | ^^^^^^^^^^^^^^^^^^^^^^^ + | ^^^^^^^^^^^^^^^^^^^^^^^ \ No newline at end of file From ae375857d53416bc5dc11d5577a639a3c700859d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Tue, 18 Jul 2023 15:46:16 -0700 Subject: [PATCH 06/10] Newline in ui-test --- Cargo.toml | 1 + .../ink/tests/ui/trait_def/fail/message_output_non_codec.stderr | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d32371acfc..5fe4372655 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,6 +52,7 @@ quickcheck = { version = "1" } quickcheck_macros = { version = "1" } quote = { version = "1" } rlibc = { version = "1" } +scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } scale-decode = { version = "0.7.0", default-features = false } scale-encode = { version = "0.3.0", default-features = false } scale-info = { version = "2.6", default-features = false } diff --git a/crates/ink/tests/ui/trait_def/fail/message_output_non_codec.stderr b/crates/ink/tests/ui/trait_def/fail/message_output_non_codec.stderr index df8688067f..1826315d23 100644 --- a/crates/ink/tests/ui/trait_def/fail/message_output_non_codec.stderr +++ b/crates/ink/tests/ui/trait_def/fail/message_output_non_codec.stderr @@ -38,4 +38,4 @@ note: the trait `parity_scale_codec::Decode` must be implemented --> $CARGO/parity-scale-codec-3.6.4/src/codec.rs | | pub trait Decode: Sized { - | ^^^^^^^^^^^^^^^^^^^^^^^ \ No newline at end of file + | ^^^^^^^^^^^^^^^^^^^^^^^ From 2d79a2f33ae8a6531262aba58a76091e1bf4d4ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Tue, 18 Jul 2023 15:46:28 -0700 Subject: [PATCH 07/10] scale --- crates/e2e/Cargo.toml | 2 +- crates/engine/Cargo.toml | 2 +- crates/env/Cargo.toml | 2 +- crates/ink/Cargo.toml | 2 +- crates/ink/codegen/Cargo.toml | 2 +- crates/ink/macro/Cargo.toml | 2 +- crates/primitives/Cargo.toml | 2 +- crates/storage/Cargo.toml | 2 +- crates/storage/traits/Cargo.toml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml index 58ab079ea0..867f7fd310 100644 --- a/crates/e2e/Cargo.toml +++ b/crates/e2e/Cargo.toml @@ -28,7 +28,7 @@ serde_json = { workspace = true } tokio = { workspace = true, features = ["rt-multi-thread"] } tracing = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter"] } -scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } +scale = { package = "parity-scale-codec", workspace = true } subxt = { workspace = true } # Substrate diff --git a/crates/engine/Cargo.toml b/crates/engine/Cargo.toml index 191dd2d5e1..b9de05ed1d 100644 --- a/crates/engine/Cargo.toml +++ b/crates/engine/Cargo.toml @@ -16,7 +16,7 @@ include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] ink_primitives = { workspace = true } -scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } +scale = { package = "parity-scale-codec", workspace = true } derive_more = { workspace = true, features = ["from", "display"] } sha2 = { workspace = true } diff --git a/crates/env/Cargo.toml b/crates/env/Cargo.toml index c30151a20d..240a0d5b86 100644 --- a/crates/env/Cargo.toml +++ b/crates/env/Cargo.toml @@ -21,7 +21,7 @@ ink_storage_traits = { workspace = true } ink_prelude = { workspace = true } ink_primitives = { workspace = true } -scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } +scale = { package = "parity-scale-codec", workspace = true } derive_more = { workspace = true, features = ["from", "display"] } num-traits = { workspace = true, features = ["i128"] } cfg-if = { workspace = true } diff --git a/crates/ink/Cargo.toml b/crates/ink/Cargo.toml index 9c49158557..10ff807003 100644 --- a/crates/ink/Cargo.toml +++ b/crates/ink/Cargo.toml @@ -23,7 +23,7 @@ ink_metadata = { workspace = true, optional = true } ink_prelude = { workspace = true } ink_macro = { workspace = true } -scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } +scale = { package = "parity-scale-codec", workspace = true } derive_more = { workspace = true, features = ["from"] } [dev-dependencies] diff --git a/crates/ink/codegen/Cargo.toml b/crates/ink/codegen/Cargo.toml index 837e0b1643..b0aa4df632 100644 --- a/crates/ink/codegen/Cargo.toml +++ b/crates/ink/codegen/Cargo.toml @@ -28,7 +28,7 @@ itertools = { workspace = true } either = { workspace = true } blake2 = { workspace = true } heck = { workspace = true } -scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } +scale = { package = "parity-scale-codec", workspace = true } impl-serde = { workspace = true, default-features = true } serde = { workspace = true, features = ["derive"] } diff --git a/crates/ink/macro/Cargo.toml b/crates/ink/macro/Cargo.toml index 418e8a3362..bd4f0aa362 100644 --- a/crates/ink/macro/Cargo.toml +++ b/crates/ink/macro/Cargo.toml @@ -19,7 +19,7 @@ ink_ir = { workspace = true } ink_codegen = { workspace = true } ink_primitives = { workspace = true } -scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } +scale = { package = "parity-scale-codec", workspace = true } syn = { workspace = true } synstructure = { workspace = true } proc-macro2 = { workspace = true } diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index f6b4264039..155369edd5 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -17,7 +17,7 @@ include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"] [dependencies] derive_more = { workspace = true, features = ["from", "display"] } ink_prelude = { workspace = true } -scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } +scale = { package = "parity-scale-codec", workspace = true } scale-decode = { workspace = true, features = ["derive"], optional = true } scale-encode = { workspace = true, features = ["derive"], optional = true } scale-info = { workspace = true, features = ["derive"], optional = true } diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index 250b8ac51e..68f845a85e 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -21,7 +21,7 @@ ink_primitives = { workspace = true } ink_storage_traits = { workspace = true } ink_prelude = { workspace = true } -scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } +scale = { package = "parity-scale-codec", workspace = true } derive_more = { workspace = true, features = ["from", "display"] } scale-info = { workspace = true, features = ["derive"], optional = true } cfg-if = { workspace = true } diff --git a/crates/storage/traits/Cargo.toml b/crates/storage/traits/Cargo.toml index c55b9a1482..8395e0922a 100644 --- a/crates/storage/traits/Cargo.toml +++ b/crates/storage/traits/Cargo.toml @@ -18,7 +18,7 @@ include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] ink_metadata = { workspace = true, features = ["derive"], optional = true } ink_primitives = { workspace = true } ink_prelude = { workspace = true } -scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] } +scale = { package = "parity-scale-codec", workspace = true } scale-info = { workspace = true, features = ["derive"], optional = true } [dev-dependencies] From af38b3a69e85a926a2fd087c5b48ec3284194c8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Tue, 18 Jul 2023 18:32:58 -0700 Subject: [PATCH 08/10] Remove package attribute --- crates/e2e/Cargo.toml | 2 +- crates/engine/Cargo.toml | 2 +- crates/env/Cargo.toml | 2 +- crates/ink/Cargo.toml | 2 +- crates/ink/codegen/Cargo.toml | 2 +- crates/ink/macro/Cargo.toml | 2 +- crates/primitives/Cargo.toml | 2 +- crates/storage/Cargo.toml | 2 +- crates/storage/traits/Cargo.toml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml index 867f7fd310..a0222b7835 100644 --- a/crates/e2e/Cargo.toml +++ b/crates/e2e/Cargo.toml @@ -28,7 +28,7 @@ serde_json = { workspace = true } tokio = { workspace = true, features = ["rt-multi-thread"] } tracing = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter"] } -scale = { package = "parity-scale-codec", workspace = true } +scale = { workspace = true } subxt = { workspace = true } # Substrate diff --git a/crates/engine/Cargo.toml b/crates/engine/Cargo.toml index b9de05ed1d..9e6876bb5e 100644 --- a/crates/engine/Cargo.toml +++ b/crates/engine/Cargo.toml @@ -16,7 +16,7 @@ include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] ink_primitives = { workspace = true } -scale = { package = "parity-scale-codec", workspace = true } +scale = { workspace = true } derive_more = { workspace = true, features = ["from", "display"] } sha2 = { workspace = true } diff --git a/crates/env/Cargo.toml b/crates/env/Cargo.toml index 240a0d5b86..7355267043 100644 --- a/crates/env/Cargo.toml +++ b/crates/env/Cargo.toml @@ -21,7 +21,7 @@ ink_storage_traits = { workspace = true } ink_prelude = { workspace = true } ink_primitives = { workspace = true } -scale = { package = "parity-scale-codec", workspace = true } +scale = { workspace = true } derive_more = { workspace = true, features = ["from", "display"] } num-traits = { workspace = true, features = ["i128"] } cfg-if = { workspace = true } diff --git a/crates/ink/Cargo.toml b/crates/ink/Cargo.toml index 10ff807003..791312fe50 100644 --- a/crates/ink/Cargo.toml +++ b/crates/ink/Cargo.toml @@ -23,7 +23,7 @@ ink_metadata = { workspace = true, optional = true } ink_prelude = { workspace = true } ink_macro = { workspace = true } -scale = { package = "parity-scale-codec", workspace = true } +scale = { workspace = true } derive_more = { workspace = true, features = ["from"] } [dev-dependencies] diff --git a/crates/ink/codegen/Cargo.toml b/crates/ink/codegen/Cargo.toml index b0aa4df632..a2b33d8b2a 100644 --- a/crates/ink/codegen/Cargo.toml +++ b/crates/ink/codegen/Cargo.toml @@ -28,7 +28,7 @@ itertools = { workspace = true } either = { workspace = true } blake2 = { workspace = true } heck = { workspace = true } -scale = { package = "parity-scale-codec", workspace = true } +scale = { workspace = true } impl-serde = { workspace = true, default-features = true } serde = { workspace = true, features = ["derive"] } diff --git a/crates/ink/macro/Cargo.toml b/crates/ink/macro/Cargo.toml index bd4f0aa362..fc6d216a33 100644 --- a/crates/ink/macro/Cargo.toml +++ b/crates/ink/macro/Cargo.toml @@ -19,7 +19,7 @@ ink_ir = { workspace = true } ink_codegen = { workspace = true } ink_primitives = { workspace = true } -scale = { package = "parity-scale-codec", workspace = true } +scale = { workspace = true } syn = { workspace = true } synstructure = { workspace = true } proc-macro2 = { workspace = true } diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index 155369edd5..c9595f8239 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -17,7 +17,7 @@ include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"] [dependencies] derive_more = { workspace = true, features = ["from", "display"] } ink_prelude = { workspace = true } -scale = { package = "parity-scale-codec", workspace = true } +scale = { workspace = true } scale-decode = { workspace = true, features = ["derive"], optional = true } scale-encode = { workspace = true, features = ["derive"], optional = true } scale-info = { workspace = true, features = ["derive"], optional = true } diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index 68f845a85e..9130e79242 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -21,7 +21,7 @@ ink_primitives = { workspace = true } ink_storage_traits = { workspace = true } ink_prelude = { workspace = true } -scale = { package = "parity-scale-codec", workspace = true } +scale = { workspace = true } derive_more = { workspace = true, features = ["from", "display"] } scale-info = { workspace = true, features = ["derive"], optional = true } cfg-if = { workspace = true } diff --git a/crates/storage/traits/Cargo.toml b/crates/storage/traits/Cargo.toml index 8395e0922a..98694e6150 100644 --- a/crates/storage/traits/Cargo.toml +++ b/crates/storage/traits/Cargo.toml @@ -18,7 +18,7 @@ include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] ink_metadata = { workspace = true, features = ["derive"], optional = true } ink_primitives = { workspace = true } ink_prelude = { workspace = true } -scale = { package = "parity-scale-codec", workspace = true } +scale = { workspace = true } scale-info = { workspace = true, features = ["derive"], optional = true } [dev-dependencies] From 6df6d00218d3dd1992f2c80689e0a8173f73c631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Tue, 18 Jul 2023 18:42:47 -0700 Subject: [PATCH 09/10] Revert "Remove package attribute" This reverts commit af38b3a69e85a926a2fd087c5b48ec3284194c8a. --- crates/e2e/Cargo.toml | 2 +- crates/engine/Cargo.toml | 2 +- crates/env/Cargo.toml | 2 +- crates/ink/Cargo.toml | 2 +- crates/ink/codegen/Cargo.toml | 2 +- crates/ink/macro/Cargo.toml | 2 +- crates/primitives/Cargo.toml | 2 +- crates/storage/Cargo.toml | 2 +- crates/storage/traits/Cargo.toml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml index a0222b7835..867f7fd310 100644 --- a/crates/e2e/Cargo.toml +++ b/crates/e2e/Cargo.toml @@ -28,7 +28,7 @@ serde_json = { workspace = true } tokio = { workspace = true, features = ["rt-multi-thread"] } tracing = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter"] } -scale = { workspace = true } +scale = { package = "parity-scale-codec", workspace = true } subxt = { workspace = true } # Substrate diff --git a/crates/engine/Cargo.toml b/crates/engine/Cargo.toml index 9e6876bb5e..b9de05ed1d 100644 --- a/crates/engine/Cargo.toml +++ b/crates/engine/Cargo.toml @@ -16,7 +16,7 @@ include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] [dependencies] ink_primitives = { workspace = true } -scale = { workspace = true } +scale = { package = "parity-scale-codec", workspace = true } derive_more = { workspace = true, features = ["from", "display"] } sha2 = { workspace = true } diff --git a/crates/env/Cargo.toml b/crates/env/Cargo.toml index 7355267043..240a0d5b86 100644 --- a/crates/env/Cargo.toml +++ b/crates/env/Cargo.toml @@ -21,7 +21,7 @@ ink_storage_traits = { workspace = true } ink_prelude = { workspace = true } ink_primitives = { workspace = true } -scale = { workspace = true } +scale = { package = "parity-scale-codec", workspace = true } derive_more = { workspace = true, features = ["from", "display"] } num-traits = { workspace = true, features = ["i128"] } cfg-if = { workspace = true } diff --git a/crates/ink/Cargo.toml b/crates/ink/Cargo.toml index 791312fe50..10ff807003 100644 --- a/crates/ink/Cargo.toml +++ b/crates/ink/Cargo.toml @@ -23,7 +23,7 @@ ink_metadata = { workspace = true, optional = true } ink_prelude = { workspace = true } ink_macro = { workspace = true } -scale = { workspace = true } +scale = { package = "parity-scale-codec", workspace = true } derive_more = { workspace = true, features = ["from"] } [dev-dependencies] diff --git a/crates/ink/codegen/Cargo.toml b/crates/ink/codegen/Cargo.toml index a2b33d8b2a..b0aa4df632 100644 --- a/crates/ink/codegen/Cargo.toml +++ b/crates/ink/codegen/Cargo.toml @@ -28,7 +28,7 @@ itertools = { workspace = true } either = { workspace = true } blake2 = { workspace = true } heck = { workspace = true } -scale = { workspace = true } +scale = { package = "parity-scale-codec", workspace = true } impl-serde = { workspace = true, default-features = true } serde = { workspace = true, features = ["derive"] } diff --git a/crates/ink/macro/Cargo.toml b/crates/ink/macro/Cargo.toml index fc6d216a33..bd4f0aa362 100644 --- a/crates/ink/macro/Cargo.toml +++ b/crates/ink/macro/Cargo.toml @@ -19,7 +19,7 @@ ink_ir = { workspace = true } ink_codegen = { workspace = true } ink_primitives = { workspace = true } -scale = { workspace = true } +scale = { package = "parity-scale-codec", workspace = true } syn = { workspace = true } synstructure = { workspace = true } proc-macro2 = { workspace = true } diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml index c9595f8239..155369edd5 100644 --- a/crates/primitives/Cargo.toml +++ b/crates/primitives/Cargo.toml @@ -17,7 +17,7 @@ include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"] [dependencies] derive_more = { workspace = true, features = ["from", "display"] } ink_prelude = { workspace = true } -scale = { workspace = true } +scale = { package = "parity-scale-codec", workspace = true } scale-decode = { workspace = true, features = ["derive"], optional = true } scale-encode = { workspace = true, features = ["derive"], optional = true } scale-info = { workspace = true, features = ["derive"], optional = true } diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index 9130e79242..68f845a85e 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -21,7 +21,7 @@ ink_primitives = { workspace = true } ink_storage_traits = { workspace = true } ink_prelude = { workspace = true } -scale = { workspace = true } +scale = { package = "parity-scale-codec", workspace = true } derive_more = { workspace = true, features = ["from", "display"] } scale-info = { workspace = true, features = ["derive"], optional = true } cfg-if = { workspace = true } diff --git a/crates/storage/traits/Cargo.toml b/crates/storage/traits/Cargo.toml index 98694e6150..8395e0922a 100644 --- a/crates/storage/traits/Cargo.toml +++ b/crates/storage/traits/Cargo.toml @@ -18,7 +18,7 @@ include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"] ink_metadata = { workspace = true, features = ["derive"], optional = true } ink_primitives = { workspace = true } ink_prelude = { workspace = true } -scale = { workspace = true } +scale = { package = "parity-scale-codec", workspace = true } scale-info = { workspace = true, features = ["derive"], optional = true } [dev-dependencies] From 4a26141d03ac6c39df8c426a1284a4e0ceffb50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Miko=C5=82ajczyk?= Date: Tue, 25 Jul 2023 12:13:12 +0200 Subject: [PATCH 10/10] Update --- Cargo.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5fe4372655..31f74cf961 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ version = "4.2.0" arrayref = { version = "0.3" } array-init = { version = "2.0", default-features = false } blake2 = { version = "0.10" } -cargo_metadata = { version = "0.15.3" } +cargo_metadata = { version = "0.17.0" } cfg-if = { version = "1.0" } contract-build = { version = "3.0.0" } derive_more = { version = "0.99.17", default-features = false } @@ -43,7 +43,8 @@ funty = { version = "2.0.0" } heck = { version = "0.4.0" } impl-serde = { version = "0.4.0", default-features = false } itertools = { version = "0.11", default-features = false } -jsonrpsee = { version = "0.18.0" } +jsonrpsee = { version = "0.19.0" } +linkme = { version = "0.3.9" } num-traits = { version = "0.2", default-features = false } paste = { version = "1.0" } pretty_assertions = { version = "1" }