Merge remote-tracking branch 'origin/master' into oty-try-runtime-v0.…

…9.37
paritytech · Feb 2, 2023 · 06c9c80 · 06c9c80
2 parents f365a6b + 907604b
commit 06c9c80
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/runtime/test-runtime/Cargo.toml b/runtime/test-runtime/Cargo.toml
@@ -132,4 +132,5 @@ std = [
 
 runtime-benchmarks = [
 	"pallet-xcm/runtime-benchmarks",
+	"xcm-builder/runtime-benchmarks",
 ]
diff --git a/xcm/pallet-xcm/Cargo.toml b/xcm/pallet-xcm/Cargo.toml
@@ -46,6 +46,8 @@ std = [
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"xcm-builder/runtime-benchmarks",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/xcm/xcm-simulator/example/src/parachain.rs b/xcm/xcm-simulator/example/src/parachain.rs
@@ -157,8 +157,8 @@ impl EnsureOriginWithArg<RuntimeOrigin, MultiLocation> for ForeignCreators {
 	}
 
 	#[cfg(feature = "runtime-benchmarks")]
-	fn successful_origin(a: &MultiLocation) -> RuntimeOrigin {
-		pallet_xcm::Origin::Xcm(a.clone()).into()
+	fn try_successful_origin(a: &MultiLocation) -> Result<RuntimeOrigin, ()> {
+		Ok(pallet_xcm::Origin::Xcm(a.clone()).into())
 	}
 }
 

diff --git a/xcm/xcm-simulator/fuzzer/Cargo.toml b/xcm/xcm-simulator/fuzzer/Cargo.toml
@@ -30,6 +30,8 @@ polkadot-parachain = { path = "../../../parachain" }
 [features]
 runtime-benchmarks = [
     "pallet-xcm/runtime-benchmarks",
+    "xcm-builder/runtime-benchmarks",
+    "frame-support/runtime-benchmarks",
 ]
 
 [[bin]]