address review comments

paritytech · Mar 21, 2023 · c0c5d55 · c0c5d55
1 parent fecbf12
commit c0c5d55
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
@@ -2080,7 +2080,8 @@ sp_api::impl_runtime_apis! {
 					Err(BenchmarkError::Skip)
 				}
 
-				fn bridged_destination() -> Result<(NetworkId, InteriorMultiLocation), BenchmarkError> {
+				fn export_message_origin_and_destination(
+				) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> {
 					// Kusama doesn't support exporting messages
 					Err(BenchmarkError::Skip)
 				}

diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs
@@ -2088,7 +2088,8 @@ sp_api::impl_runtime_apis! {
 					Err(BenchmarkError::Skip)
 				}
 
-				fn bridged_destination() -> Result<(NetworkId, InteriorMultiLocation), BenchmarkError> {
+				fn export_message_origin_and_destination(
+				) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> {
 					// Rococo doesn't support exporting messages
 					Err(BenchmarkError::Skip)
 				}

diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
@@ -1819,7 +1819,8 @@ sp_api::impl_runtime_apis! {
 					Err(BenchmarkError::Skip)
 				}
 
-				fn bridged_destination() -> Result<(NetworkId, InteriorMultiLocation), BenchmarkError> {
+				fn export_message_origin_and_destination(
+				) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> {
 					// Westend doesn't support exporting messages
 					Err(BenchmarkError::Skip)
 				}

diff --git a/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs b/xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs
@@ -497,14 +497,12 @@ benchmarks! {
 	}
 
 	export_message {
-		let mut executor = new_executor::<T>(Here.into_location());
-		let (network, destination) = T::bridged_destination()?;
-		let expected_message = Xcm(vec![TransferAsset {
-			assets: (Here, 100u128).into(),
-			beneficiary: Parachain(2).into(),
-		}]);
+		let (origin, network, destination) = T::export_message_origin_and_destination()?;
+		let mut executor = new_executor::<T>(origin);
+		// Actual exported message has no bearing on this instruction's weight, use empty message.
+		let inner_xcm = Xcm(vec![]);
 		let xcm = Xcm(vec![ExportMessage {
-			network, destination, xcm: expected_message.clone(),
+			network, destination, xcm: inner_xcm,
 		}]);
 	}: {
 		executor.bench_process(xcm)?;

diff --git a/xcm/pallet-xcm-benchmarks/src/generic/mock.rs b/xcm/pallet-xcm-benchmarks/src/generic/mock.rs
@@ -187,7 +187,8 @@ impl generic::Config for Test {
 		Ok((Default::default(), Default::default(), assets))
 	}
 
-	fn bridged_destination() -> Result<(NetworkId, InteriorMultiLocation), BenchmarkError> {
+	fn export_message_origin_and_destination(
+	) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError> {
 		// No MessageExporter in tests
 		Err(BenchmarkError::Skip)
 	}

diff --git a/xcm/pallet-xcm-benchmarks/src/generic/mod.rs b/xcm/pallet-xcm-benchmarks/src/generic/mod.rs
@@ -75,10 +75,11 @@ pub mod pallet {
 		/// Return an unlocker, owner and assets that can be locked and unlocked.
 		fn unlockable_asset() -> Result<(MultiLocation, MultiLocation, MultiAsset), BenchmarkError>;
 
-		/// A valid `(NetworkId, InteriorMultiLocation)` we can successfully export message to.
+		/// A `(MultiLocation, NetworkId, InteriorMultiLocation)` we can successfully export message to.
 		///
 		/// If set to `Err`, benchmarks which rely on `export_message` will be skipped.
-		fn bridged_destination() -> Result<(NetworkId, InteriorMultiLocation), BenchmarkError>;
+		fn export_message_origin_and_destination(
+		) -> Result<(MultiLocation, NetworkId, InteriorMultiLocation), BenchmarkError>;
 	}
 
 	#[pallet::pallet]