Skip to content

Commit ded873f

Browse files
pmikolajczyk41pmikolajczyk41
authored
Workspace dependencies and properties (#1835)
* Workspace properties changed in-place * Workspace dependencies changed in-place * , default-features = true * pin * ui tests * Newline in ui-test * scale * Remove package attribute * Revert "Remove package attribute" This reverts commit af38b3a. * Update
1 parent 9e38056 commit ded873f

15 files changed

Lines changed: 326 additions & 252 deletions

File tree

‎Cargo.toml‎

Lines changed: 83 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,101 @@
11
[workspace]
22
resolver = "2"
33
members = [
4-
"crates/ink",
5-
"crates/metadata",
64
"crates/allocator",
5+
"crates/e2e",
6+
"crates/e2e/macro",
7+
"crates/engine",
8+
"crates/env",
79
"crates/ink",
8-
"crates/ink/macro",
9-
"crates/ink/ir",
1010
"crates/ink/codegen",
11+
"crates/ink/ir",
1112
"crates/ink/macro",
13+
"crates/metadata",
1214
"crates/prelude",
1315
"crates/primitives",
14-
"crates/e2e",
15-
"crates/e2e/macro",
16-
"crates/engine",
17-
"crates/env",
1816
"crates/storage",
1917
"crates/storage/traits",
2018
]
2119
exclude = [
22-
"integration-tests/",
20+
"integration-tests",
2321
]
2422

23+
[workspace.package]
24+
authors = ["Parity Technologies <admin@parity.io>"]
25+
categories = ["no-std", "embedded"]
26+
edition = "2021"
27+
homepage = "https://www.parity.io/"
28+
keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"]
29+
license = "Apache-2.0"
30+
repository = "https://github.com/paritytech/ink"
31+
version = "4.2.0"
32+
33+
[workspace.dependencies]
34+
arrayref = { version = "0.3" }
35+
array-init = { version = "2.0", default-features = false }
36+
blake2 = { version = "0.10" }
37+
cargo_metadata = { version = "0.17.0" }
38+
cfg-if = { version = "1.0" }
39+
contract-build = { version = "3.0.0" }
40+
derive_more = { version = "0.99.17", default-features = false }
41+
either = { version = "1.5", default-features = false }
42+
funty = { version = "2.0.0" }
43+
heck = { version = "0.4.0" }
44+
impl-serde = { version = "0.4.0", default-features = false }
45+
itertools = { version = "0.11", default-features = false }
46+
jsonrpsee = { version = "0.19.0" }
47+
linkme = { version = "0.3.9" }
48+
num-traits = { version = "0.2", default-features = false }
49+
paste = { version = "1.0" }
50+
pretty_assertions = { version = "1" }
51+
proc-macro2 = { version = "1" }
52+
quickcheck = { version = "1" }
53+
quickcheck_macros = { version = "1" }
54+
quote = { version = "1" }
55+
rlibc = { version = "1" }
56+
scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] }
57+
scale-decode = { version = "0.7.0", default-features = false }
58+
scale-encode = { version = "0.3.0", default-features = false }
59+
scale-info = { version = "2.6", default-features = false }
60+
schemars = { version = "0.8" }
61+
secp256k1 = { version = "0.27.0" }
62+
serde = { version = "1.0.137", default-features = false }
63+
serde_json = { version = "1.0.81" }
64+
sha2 = { version = "0.10" }
65+
sha3 = { version = "0.10" }
66+
static_assertions = { version = "1.1" }
67+
subxt = { version = "0.29.0" }
68+
syn = { version = "2" }
69+
synstructure = { version = "0.13.0" }
70+
tokio = { version = "1.18.2" }
71+
tracing = { version = "0.1.37" }
72+
tracing-subscriber = { version = "0.3.17" }
73+
trybuild = { version = "1.0.60" }
74+
which = { version = "4.4.0" }
75+
xxhash-rust = { version = "0.8" }
76+
77+
# Substrate dependencies
78+
pallet-contracts-primitives = { version = "24.0.0", default-features = false }
79+
sp-core = { version = "21.0.0", default-features = false }
80+
sp-keyring = { version = "24.0.0", default-features = false }
81+
sp-runtime = { version = "24.0.0", default-features = false }
82+
sp-weights = { version = "20.0.0", default-features = false }
83+
84+
# Local dependencies
85+
ink = { version = "=4.2.0", path = "crates/ink", default-features = false }
86+
ink_allocator = { version = "=4.2.0", path = "crates/allocator", default-features = false }
87+
ink_codegen = { version = "=4.2.0", path = "crates/ink/codegen", default-features = false }
88+
ink_e2e_macro = { version = "=4.2.0", path = "crates/e2e/macro", default-features = false }
89+
ink_engine = { version = "=4.2.0", path = "crates/engine", default-features = false }
90+
ink_env = { version = "4.2.0", path = "crates/env", default-features = false }
91+
ink_ir = { version = "4.2.0", path = "crates/ink/ir", default-features = false }
92+
ink_macro = { version = "=4.2.0", path = "crates/ink/macro", default-features = false }
93+
ink_metadata = { version = "=4.2.0", path = "crates/metadata", default-features = false }
94+
ink_prelude = { version = "=4.2.0", path = "crates/prelude", default-features = false }
95+
ink_primitives = { version = "=4.2.0", path = "crates/primitives", default-features = false }
96+
ink_storage = { version = "=4.2.0", path = "crates/storage", default-features = false }
97+
ink_storage_traits = { version = "=4.2.0", path = "crates/storage/traits", default-features = false }
98+
2599
[profile.release]
26100
panic = "abort"
27101
lto = true

‎crates/allocator/Cargo.toml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
[package]
22
name = "ink_allocator"
3-
version = "4.2.0"
3+
version.workspace = true
44
authors = ["Parity Technologies <admin@parity.io>", "Robin Freyler <robin@parity.io>"]
5-
edition = "2021"
5+
edition.workspace = true
66

7-
license = "Apache-2.0"
7+
license.workspace = true
88
readme = "README.md"
9-
repository = "https://github.com/paritytech/ink"
9+
repository.workspace = true
1010
documentation = "https://docs.rs/ink_allocator/"
11-
homepage = "https://www.parity.io/"
11+
homepage.workspace = true
1212
description = "[ink!] Bindings to the Wasm heap memory allocator."
13-
keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"]
14-
categories = ["no-std", "embedded"]
13+
keywords.workspace = true
14+
categories.workspace = true
1515
include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]
1616

1717
[dependencies]
18-
cfg-if = "1.0"
18+
cfg-if = { workspace = true }
1919

2020
[dev-dependencies]
21-
quickcheck = "1"
22-
quickcheck_macros = "1"
21+
quickcheck = { workspace = true }
22+
quickcheck_macros = { workspace = true }
2323

2424
[features]
2525
default = ["std"]

‎crates/e2e/Cargo.toml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
[package]
22
name = "ink_e2e"
3-
version = "4.2.0"
4-
authors = ["Parity Technologies <admin@parity.io>"]
5-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
66

7-
license = "Apache-2.0"
7+
license.workspace = true
88
readme = "README.md"
9-
repository = "https://github.com/paritytech/ink"
9+
repository.workspace = true
1010
documentation = "https://docs.rs/ink_e2e/"
11-
homepage = "https://www.parity.io/"
11+
homepage.workspace = true
1212
description = "[ink!] End-to-end testing framework for smart contracts."
13-
keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"]
14-
categories = ["no-std", "embedded"]
13+
keywords.workspace = true
14+
categories.workspace = true
1515
include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"]
1616

1717
[dependencies]
18-
ink_e2e_macro = { version = "=4.2.0", path = "./macro" }
19-
ink = { version = "=4.2.0", path = "../ink" }
20-
ink_env = { version = "=4.2.0", path = "../env" }
21-
ink_primitives = { version = "=4.2.0", path = "../primitives" }
18+
ink_e2e_macro = { workspace = true, default-features = true }
19+
ink = { workspace = true, default-features = true }
20+
ink_env = { workspace = true, default-features = true }
21+
ink_primitives = { workspace = true, default-features = true }
2222

23-
funty = "2.0.0"
24-
impl-serde = { version = "0.4.0", default-features = false }
25-
jsonrpsee = { version = "0.19.0", features = ["ws-client"] }
26-
serde = { version = "1.0.137", default-features = false, features = ["derive"] }
27-
serde_json = { version = "1.0.81" }
28-
tokio = { version = "1.18.2", features = ["rt-multi-thread"] }
29-
tracing = "0.1.37"
30-
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
31-
scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] }
32-
subxt = "0.29.0"
23+
funty = { workspace = true }
24+
impl-serde = { workspace = true }
25+
jsonrpsee = { workspace = true, features = ["ws-client"] }
26+
serde = { workspace = true, features = ["derive"] }
27+
serde_json = { workspace = true }
28+
tokio = { workspace = true, features = ["rt-multi-thread"] }
29+
tracing = { workspace = true }
30+
tracing-subscriber = { workspace = true, features = ["env-filter"] }
31+
scale = { package = "parity-scale-codec", workspace = true }
32+
subxt = { workspace = true }
3333

3434
# Substrate
35-
pallet-contracts-primitives = "24.0.0"
36-
sp-core = { version = "21.0.0", default-features = false }
37-
sp-keyring = "24.0.0"
38-
sp-runtime = "24.0.0"
39-
sp-weights = "20.0.0"
35+
pallet-contracts-primitives = { workspace = true }
36+
sp-core = { workspace = true }
37+
sp-keyring = { workspace = true }
38+
sp-runtime = { workspace = true }
39+
sp-weights = { workspace = true }
4040

4141
[dev-dependencies]
4242
# Required for the doctest of `MessageBuilder::call`
43-
scale-info = { version = "2.6", default-features = false, features = ["derive"] }
43+
scale-info = { workspace = true, features = ["derive"] }
4444

4545
[features]
4646
default = ["std"]

‎crates/e2e/macro/Cargo.toml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
[package]
22
name = "ink_e2e_macro"
3-
version = "4.2.0"
4-
authors = ["Parity Technologies <admin@parity.io>"]
5-
edition = "2021"
3+
version.workspace = true
4+
authors.workspace = true
5+
edition.workspace = true
66

7-
license = "Apache-2.0"
7+
license.workspace = true
88
readme = "../README.md"
9-
repository = "https://github.com/paritytech/ink"
9+
repository.workspace = true
1010
documentation = "https://docs.rs/ink_macro/"
11-
homepage = "https://www.parity.io/"
11+
homepage.workspace = true
1212
description = "[ink!] Macro for generating end-to-end tests"
13-
keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"]
14-
categories = ["no-std", "embedded"]
13+
keywords.workspace = true
14+
categories.workspace = true
1515
include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]
1616

1717
[lib]
1818
name = "ink_e2e_macro"
1919
proc-macro = true
2020

2121
[dependencies]
22-
ink_ir = { version = "=4.2.0", path = "../../ink/ir" }
23-
cargo_metadata = "0.17.0"
24-
contract-build = "3.0.0"
25-
derive_more = "0.99.17"
26-
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
27-
serde_json = "1.0.89"
28-
syn = "2"
29-
proc-macro2 = "1"
30-
quote = "1"
31-
which = "4.4.0"
22+
ink_ir = { workspace = true, default-features = true }
23+
cargo_metadata = { workspace = true }
24+
contract-build = { workspace = true }
25+
derive_more = { workspace = true, default-features = true }
26+
tracing-subscriber = { workspace = true, features = ["env-filter"] }
27+
serde_json = { workspace = true }
28+
syn = { workspace = true }
29+
proc-macro2 = { workspace = true }
30+
quote = { workspace = true }
31+
which = { workspace = true }

‎crates/engine/Cargo.toml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
[package]
22
name = "ink_engine"
3-
version = "4.2.0"
3+
version.workspace = true
44
authors = ["Parity Technologies <admin@parity.io>", "Michael Müller <michi@parity.io>"]
5-
edition = "2021"
5+
edition.workspace = true
66

7-
license = "Apache-2.0"
7+
license.workspace = true
88
readme = "README.md"
9-
repository = "https://github.com/paritytech/ink"
9+
repository.workspace = true
1010
documentation = "https://docs.rs/ink_engine/"
11-
homepage = "https://www.parity.io/"
11+
homepage.workspace = true
1212
description = "[ink!] Off-chain environment for testing."
13-
keywords = ["wasm", "parity", "webassembly", "blockchain", "edsl"]
14-
categories = ["no-std", "embedded"]
13+
keywords.workspace = true
14+
categories.workspace = true
1515
include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]
1616

1717
[dependencies]
18-
ink_primitives = { version = "=4.2.0", path = "../../crates/primitives", default-features = false }
19-
scale = { package = "parity-scale-codec", version = "3.4", default-features = false, features = ["derive"] }
20-
derive_more = { version = "0.99", default-features = false, features = ["from", "display"] }
18+
ink_primitives = { workspace = true }
19+
scale = { package = "parity-scale-codec", workspace = true }
20+
derive_more = { workspace = true, features = ["from", "display"] }
2121

22-
sha2 = { version = "0.10" }
23-
sha3 = { version = "0.10" }
24-
blake2 = { version = "0.10" }
22+
sha2 = { workspace = true }
23+
sha3 = { workspace = true }
24+
blake2 = { workspace = true }
2525

2626
# ECDSA for the off-chain environment.
27-
secp256k1 = { version = "0.27.0", features = ["recovery", "global-context"], optional = true }
27+
secp256k1 = { workspace = true, features = ["recovery", "global-context"], optional = true }
2828

2929
[features]
3030
default = ["std"]

0 commit comments

Comments
 (0)