fixing collator node build benchmark feature propagation (#249)

* fixing collator node build benchmark feature propagation * fix std leak in test-utils
integritee-network · Feb 7, 2024 · a6a00e7 · a6a00e7
1 parent 0525c08
commit a6a00e7
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,7 +24,7 @@ chrono = { version = "0.4", default-features = false, features = ["serde"] }
 derive_more = "0.99.16"
 env_logger = "0.9.0"
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
-hex-literal = "0.3.3"
+hex-literal = "0.4.1"
 log = { version = "0.4.20", default-features = false }
 rustc-hex = { version = "2.1.0", default-features = false }
 serde = { version = "1.0.188", default-features = false, features = ["alloc", "derive"] }

diff --git a/claims/Cargo.toml b/claims/Cargo.toml
@@ -37,6 +37,7 @@ default = ["std"]
 
 std = [
     "claims-primitives/std",
+    "frame-benchmarking?/std",
     "frame-support/std",
     "frame-system/std",
     "pallet-balances/std",
@@ -50,7 +51,7 @@ std = [
     "sp-std/std",
 ]
 runtime-benchmarks = [
-    "frame-benchmarking",
+    "frame-benchmarking/runtime-benchmarks",
     "frame-support/runtime-benchmarks",
     "frame-system/runtime-benchmarks",
     "libsecp256k1/hmac",

diff --git a/enclave-bridge/Cargo.toml b/enclave-bridge/Cargo.toml
@@ -32,7 +32,7 @@ sp-std = { workspace = true }
 frame-benchmarking = { workspace = true, optional = true }
 hex-literal = { workspace = true, optional = true }
 pallet-balances = { workspace = true, optional = true }
-test-utils = { path = "../test-utils", optional = true }
+test-utils = { default-features = false, path = "../test-utils", optional = true }
 
 [dev-dependencies]
 env_logger = { workspace = true }
@@ -47,6 +47,7 @@ test-utils = { path = "../test-utils" }
 default = ["std"]
 std = [
     "enclave-bridge-primitives/std",
+    "frame-benchmarking?/std",
     "frame-support/std",
     "frame-system/std",
     "log/std",
@@ -62,7 +63,7 @@ std = [
     "teerex-primitives/std",
 ]
 runtime-benchmarks = [
-    "frame-benchmarking",
+    "frame-benchmarking/runtime-benchmarks",
     "hex-literal",
     "pallet-balances",
     "pallet-timestamp/runtime-benchmarks",

diff --git a/sidechain/Cargo.toml b/sidechain/Cargo.toml
@@ -34,7 +34,7 @@ frame-benchmarking = { workspace = true, optional = true }
 hex-literal = { workspace = true, optional = true }
 pallet-balances = { workspace = true, optional = true }
 teerex-primitives = { path = "../primitives/teerex", default-features = false }
-test-utils = { path = "../test-utils", optional = true }
+test-utils = { default-features = false, path = "../test-utils", optional = true }
 
 [dev-dependencies]
 env_logger = { workspace = true }
@@ -49,6 +49,7 @@ test-utils = { path = "../test-utils" }
 default = ["std"]
 std = [
     "enclave-bridge-primitives/std",
+    "frame-benchmarking?/std",
     "frame-support/std",
     "frame-system/std",
     "log/std",
@@ -66,7 +67,7 @@ std = [
     "teerex-primitives/std",
 ]
 runtime-benchmarks = [
-    "frame-benchmarking",
+    "frame-benchmarking/runtime-benchmarks",
     "hex-literal",
     "pallet-balances",
     "pallet-timestamp/runtime-benchmarks",

diff --git a/teeracle/Cargo.toml b/teeracle/Cargo.toml
@@ -33,7 +33,7 @@ sp-std = { workspace = true }
 frame-benchmarking = { workspace = true, optional = true }
 hex-literal = { workspace = true, optional = true }
 pallet-timestamp = { workspace = true, optional = true }
-test-utils = { path = "../test-utils", optional = true }
+test-utils = { default-features = false, path = "../test-utils", optional = true }
 
 [dev-dependencies]
 sp-externalities = { workspace = true }
@@ -48,6 +48,7 @@ pallet-timestamp = { workspace = true }
 [features]
 default = ["std"]
 std = [
+    "frame-benchmarking?/std",
     "frame-support/std",
     "frame-system/std",
     "log/std",
@@ -63,7 +64,7 @@ std = [
     "teerex-primitives/std",
 ]
 runtime-benchmarks = [
-    "frame-benchmarking",
+    "frame-benchmarking/runtime-benchmarks",
     "hex-literal",
     "pallet-timestamp/runtime-benchmarks",
     "test-utils",

diff --git a/teerex/Cargo.toml b/teerex/Cargo.toml
@@ -33,7 +33,7 @@ sp-std = { workspace = true }
 frame-benchmarking = { workspace = true, optional = true }
 hex-literal = { workspace = true, optional = true }
 pallet-balances = { workspace = true, optional = true }
-test-utils = { path = "../test-utils", optional = true }
+test-utils = { default-features = false, path = "../test-utils", optional = true }
 
 [dev-dependencies]
 env_logger = { workspace = true }
@@ -49,6 +49,7 @@ serde_json = { workspace = true, features = ["std"] }
 [features]
 default = ["std"]
 std = [
+    "frame-benchmarking?/std",
     "frame-support/std",
     "frame-system/std",
     "log/std",
@@ -65,7 +66,7 @@ std = [
     "webpki/std",
 ]
 runtime-benchmarks = [
-    "frame-benchmarking",
+    "frame-benchmarking/runtime-benchmarks",
     "hex-literal",
     "pallet-balances",
     "pallet-timestamp/runtime-benchmarks",

diff --git a/xcm-transactor/Cargo.toml b/xcm-transactor/Cargo.toml
@@ -17,6 +17,7 @@ scale-info = { workspace = true }
 xcm-transactor-primitives = { default-features = false, path = "../primitives/xcm-transactor", features = ["dot", "ksm"] }
 
 # substrate
+frame-benchmarking = { workspace = true, optional = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 sp-core = { workspace = true }
@@ -48,6 +49,7 @@ sp-keyring = { workspace = true }
 default = ["std"]
 std = [
     "cumulus-primitives-core/std",
+    "frame-benchmarking?/std",
     "frame-support/std",
     "frame-system/std",
     "log/std",
@@ -60,6 +62,6 @@ std = [
     "xcm-transactor-primitives/std",
     "staging-xcm/std",
 ]
-runtime-benchmarks = []
+runtime-benchmarks = ["frame-benchmarking/runtime-benchmarks"]
 
 try-runtime = ["frame-support/try-runtime"]