From 84701e08509dcfa7605194fe291f3b526a5f539c Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Tue, 22 Aug 2023 16:19:44 +0200 Subject: [PATCH 1/2] Fix xcm-builder mock (preparation for monorepo) The CI fails here when the runtime-benchmarks feature is enabled in the workspace. Signed-off-by: Oliver Tale-Yazdi --- xcm/xcm-builder/Cargo.toml | 4 ++++ xcm/xcm-builder/src/tests/pay/mock.rs | 2 ++ 2 files changed, 6 insertions(+) diff --git a/xcm/xcm-builder/Cargo.toml b/xcm/xcm-builder/Cargo.toml index 702d5bd7fa06..f215c2dbe7e0 100644 --- a/xcm/xcm-builder/Cargo.toml +++ b/xcm/xcm-builder/Cargo.toml @@ -42,6 +42,10 @@ runtime-benchmarks = [ "frame-support/runtime-benchmarks", "frame-system/runtime-benchmarks", "xcm-executor/runtime-benchmarks", + "pallet-assets/runtime-benchmarks", + "pallet-balances/runtime-benchmarks", + "pallet-salary/runtime-benchmarks", + "pallet-xcm/runtime-benchmarks", ] std = [ "log/std", diff --git a/xcm/xcm-builder/src/tests/pay/mock.rs b/xcm/xcm-builder/src/tests/pay/mock.rs index 3231611d3dd8..c663b0a4d76f 100644 --- a/xcm/xcm-builder/src/tests/pay/mock.rs +++ b/xcm/xcm-builder/src/tests/pay/mock.rs @@ -119,6 +119,8 @@ impl pallet_assets::Config for Test { type RemoveItemsLimit = RemoveItemsLimit; type AssetIdParameter = AssetIdForAssets; type CallbackHandle = (); + #[cfg(feature = "runtime-benchmarks")] + type BenchmarkHelper = (); } parameter_types! { From 8812cb3b9b0c23072682e8754a500a6ad6b1f0d0 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Tue, 22 Aug 2023 16:39:09 +0200 Subject: [PATCH 2/2] Update xcm/xcm-builder/Cargo.toml --- xcm/xcm-builder/Cargo.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/xcm/xcm-builder/Cargo.toml b/xcm/xcm-builder/Cargo.toml index f215c2dbe7e0..6e4db1016864 100644 --- a/xcm/xcm-builder/Cargo.toml +++ b/xcm/xcm-builder/Cargo.toml @@ -43,9 +43,6 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "xcm-executor/runtime-benchmarks", "pallet-assets/runtime-benchmarks", - "pallet-balances/runtime-benchmarks", - "pallet-salary/runtime-benchmarks", - "pallet-xcm/runtime-benchmarks", ] std = [ "log/std",