From b86b693577f86edcccce7538074e3ba75ecda3be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 30 Jan 2025 12:01:52 +0100 Subject: [PATCH] Remove unnecessary `scale` + `scale-info` deps from contracts (#2386) * Remove unnecessary `scale` + `scale-info` deps from contracts The `ink` umbrella crate re-exports them since a while. * Reorder `features` in `Cargo.toml` --- .../complex-storage-structures/Cargo.toml | 2 -- .../public/contract-invocation/Cargo.toml | 36 ++++++++----------- .../contract-invocation/contract1/Cargo.toml | 18 ++++------ .../contract-invocation/contract2/Cargo.toml | 18 ++++------ .../virtual_contract/Cargo.toml | 18 ++++------ .../virtual_contract_ver1/Cargo.toml | 18 ++++------ .../virtual_contract_ver2/Cargo.toml | 18 ++++------ 7 files changed, 45 insertions(+), 83 deletions(-) diff --git a/integration-tests/public/complex-storage-structures/Cargo.toml b/integration-tests/public/complex-storage-structures/Cargo.toml index 934a1ec064..130a727bc8 100644 --- a/integration-tests/public/complex-storage-structures/Cargo.toml +++ b/integration-tests/public/complex-storage-structures/Cargo.toml @@ -7,8 +7,6 @@ publish = false [dependencies] ink = { path = "../../../crates/ink", default-features = false } -scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive"] } -scale-info = { version = "2.11", default-features = false } [dev-dependencies] ink_e2e = { path = "../../../crates/e2e" } diff --git a/integration-tests/public/contract-invocation/Cargo.toml b/integration-tests/public/contract-invocation/Cargo.toml index 0474cd97db..c19ea7fb0e 100644 --- a/integration-tests/public/contract-invocation/Cargo.toml +++ b/integration-tests/public/contract-invocation/Cargo.toml @@ -7,29 +7,8 @@ authors = ["Víctor M. González "] [lib] path = "lib.rs" -[features] -default = ["std"] -std = [ - "ink/std", - "scale/std", - "scale-info/std", - "contract1/std", - "contract2/std", - "virtual_contract/std", - "virtual_contract_ver1/std", - "virtual_contract_ver2/std", -] -ink-as-dependency = [] -e2e-tests = [] - [dependencies] ink = { path = "../../../crates/ink", default-features = false } -scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [ - "derive", -] } -scale-info = { version = "2.11.1", default-features = false, features = [ - "derive", -], optional = true } contract1 = { path = "./contract1", default-features = false, features = [ "ink-as-dependency", ] } @@ -49,6 +28,21 @@ virtual_contract_ver2 = { path = "./virtual_contract_ver2", default-features = f [dev-dependencies] ink_e2e = { path = "../../../crates/e2e" } +[features] +default = ["std"] +std = [ + "ink/std", + "scale/std", + "scale-info/std", + "contract1/std", + "contract2/std", + "virtual_contract/std", + "virtual_contract_ver1/std", + "virtual_contract_ver2/std", +] +ink-as-dependency = [] +e2e-tests = [] + [profile.dev] overflow-checks = false diff --git a/integration-tests/public/contract-invocation/contract1/Cargo.toml b/integration-tests/public/contract-invocation/contract1/Cargo.toml index b4a2ba2504..1d047cd930 100644 --- a/integration-tests/public/contract-invocation/contract1/Cargo.toml +++ b/integration-tests/public/contract-invocation/contract1/Cargo.toml @@ -7,24 +7,18 @@ authors = ["Víctor M. González "] [lib] path = "lib.rs" -[features] -default = ["std"] -std = ["ink/std", "scale/std", "scale-info/std"] -ink-as-dependency = [] -e2e-tests = [] - [dependencies] ink = { path = "../../../../crates/ink", default-features = false } -scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [ - "derive", -] } -scale-info = { version = "2.11.1", default-features = false, features = [ - "derive", -], optional = true } [dev-dependencies] ink_e2e = { path = "../../../../crates/e2e" } +[features] +default = ["std"] +std = ["ink/std"] +ink-as-dependency = [] +e2e-tests = [] + [profile.dev] overflow-checks = false diff --git a/integration-tests/public/contract-invocation/contract2/Cargo.toml b/integration-tests/public/contract-invocation/contract2/Cargo.toml index d83014aa22..eae5737e78 100644 --- a/integration-tests/public/contract-invocation/contract2/Cargo.toml +++ b/integration-tests/public/contract-invocation/contract2/Cargo.toml @@ -7,24 +7,18 @@ authors = ["Víctor M. González "] [lib] path = "lib.rs" -[features] -default = ["std"] -std = ["ink/std", "scale/std", "scale-info/std"] -ink-as-dependency = [] -e2e-tests = [] - [dependencies] ink = { path = "../../../../crates/ink", default-features = false } -scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [ - "derive", -] } -scale-info = { version = "2.11.1", default-features = false, features = [ - "derive", -], optional = true } [dev-dependencies] ink_e2e = { path = "../../../../crates/e2e" } +[features] +default = ["std"] +std = ["ink/std"] +ink-as-dependency = [] +e2e-tests = [] + [profile.dev] overflow-checks = false diff --git a/integration-tests/public/contract-invocation/virtual_contract/Cargo.toml b/integration-tests/public/contract-invocation/virtual_contract/Cargo.toml index 699dee19e8..1ea243eb53 100644 --- a/integration-tests/public/contract-invocation/virtual_contract/Cargo.toml +++ b/integration-tests/public/contract-invocation/virtual_contract/Cargo.toml @@ -7,24 +7,18 @@ authors = ["Víctor M. González "] [lib] path = "lib.rs" -[features] -default = ["std"] -std = ["ink/std", "scale/std", "scale-info/std"] -ink-as-dependency = [] -e2e-tests = [] - [dependencies] ink = { path = "../../../../crates/ink", default-features = false } -scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [ - "derive", -] } -scale-info = { version = "2.11.1", default-features = false, features = [ - "derive", -], optional = true } [dev-dependencies] ink_e2e = { path = "../../../../crates/e2e" } +[features] +default = ["std"] +std = ["ink/std"] +ink-as-dependency = [] +e2e-tests = [] + [profile.dev] overflow-checks = false diff --git a/integration-tests/public/contract-invocation/virtual_contract_ver1/Cargo.toml b/integration-tests/public/contract-invocation/virtual_contract_ver1/Cargo.toml index 85c7d755be..d392faf589 100644 --- a/integration-tests/public/contract-invocation/virtual_contract_ver1/Cargo.toml +++ b/integration-tests/public/contract-invocation/virtual_contract_ver1/Cargo.toml @@ -7,24 +7,18 @@ authors = ["Víctor M. González "] [lib] path = "lib.rs" -[features] -default = ["std"] -std = ["ink/std", "scale/std", "scale-info/std"] -ink-as-dependency = [] -e2e-tests = [] - [dependencies] ink = { path = "../../../../crates/ink", default-features = false } -scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [ - "derive", -] } -scale-info = { version = "2.11.1", default-features = false, features = [ - "derive", -], optional = true } [dev-dependencies] ink_e2e = { path = "../../../../crates/e2e" } +[features] +default = ["std"] +std = ["ink/std"] +ink-as-dependency = [] +e2e-tests = [] + [profile.dev] overflow-checks = false diff --git a/integration-tests/public/contract-invocation/virtual_contract_ver2/Cargo.toml b/integration-tests/public/contract-invocation/virtual_contract_ver2/Cargo.toml index 8433a13b01..ad674601aa 100644 --- a/integration-tests/public/contract-invocation/virtual_contract_ver2/Cargo.toml +++ b/integration-tests/public/contract-invocation/virtual_contract_ver2/Cargo.toml @@ -7,24 +7,18 @@ authors = ["Víctor M. González "] [lib] path = "lib.rs" -[features] -default = ["std"] -std = ["ink/std", "scale/std", "scale-info/std"] -ink-as-dependency = [] -e2e-tests = [] - [dependencies] ink = { path = "../../../../crates/ink", default-features = false } -scale = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = [ - "derive", -] } -scale-info = { version = "2.11.1", default-features = false, features = [ - "derive", -], optional = true } [dev-dependencies] ink_e2e = { path = "../../../../crates/e2e" } +[features] +default = ["std"] +std = ["ink/std"] +ink-as-dependency = [] +e2e-tests = [] + [profile.dev] overflow-checks = false