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`
use-ink · Jan 30, 2025 · b86b693 · b86b693
1 parent 859b3d9
commit b86b693
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 83 deletions.
diff --git 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
@@ -7,29 +7,8 @@ authors = ["Víctor M. González <victor.gonzalez@coinfabrik.com>"]
 [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
@@ -7,24 +7,18 @@ authors = ["Víctor M. González <victor.gonzalez@coinfabrik.com>"]
 [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
@@ -7,24 +7,18 @@ authors = ["Víctor M. González <victor.gonzalez@coinfabrik.com>"]
 [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
@@ -7,24 +7,18 @@ authors = ["Víctor M. González <victor.gonzalez@coinfabrik.com>"]
 [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
@@ -7,24 +7,18 @@ authors = ["Víctor M. González <victor.gonzalez@coinfabrik.com>"]
 [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
@@ -7,24 +7,18 @@ authors = ["Víctor M. González <victor.gonzalez@coinfabrik.com>"]
 [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