make benchmarks execute

node/network/availability-distribution/src/requester/mod.rs

@@ -159,7 +159,7 @@ impl Requester {
 				// Just book keeping - we are already requesting that chunk:
 				{
 					e.get_mut().add_leaf(leaf);
-				}
+				},
 				Entry::Vacant(e) => {
 					let tx = self.tx.clone();
 					let metrics = self.metrics.clone();

node/network/collator-protocol/src/validator_side/mod.rs

@@ -1423,7 +1423,7 @@ async fn poll_collation_response(
 				);
 
 				CollationFetchResult::Error(COST_WRONG_PARA)
-			}
+			},
 			Ok(CollationFetchingResponse::Collation(receipt, pov)) => {
 				tracing::debug!(
 					target: LOG_TARGET,

node/network/statement-distribution/src/tests.rs

@@ -1814,7 +1814,7 @@ fn peer_cant_flood_with_large_statements() {
 					if p == peer_a && r == COST_APPARENT_FLOOD =>
 				{
 					punished = true;
-				}
+				},
 
 				m => panic!("Unexpected message: {:?}", m),
 			}

runtime/westend/src/lib.rs

@@ -1567,6 +1567,10 @@ sp_api::impl_runtime_apis! {
 				fn worst_case_response() -> (u64, Response) {
 					(0u64, Default::default())
 				}
+
+				fn transact_origin() -> Option<MultiLocation> {
+					Some(Westmint::get())
+				}
 			}
 
 			type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;

xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs

@@ -84,7 +84,7 @@ benchmarks! {
 		let instruction = Instruction::ReserveAssetDeposited(multiassets.clone());
 		let xcm = Xcm(vec![instruction]);
 	}: {
-		executor.execute(xcm)?;
+		executor.execute(xcm).map_err(|_| BenchmarkError::Skip)?;
 	} verify {
 		assert_eq!(executor.holding, multiassets.into());
 	}
@@ -105,7 +105,8 @@ benchmarks! {
 	// and included in the final weight calculation. So this is just the overhead of submitting
 	// a noop call.
 	transact {
-		let mut executor = new_executor::<T>(Default::default());
+		let origin = T::transact_origin().ok_or(BenchmarkError::Skip)?;
+		let mut executor = new_executor::<T>(origin);
 		let noop_call: <T as Config>::Call = frame_system::Call::remark_with_event {
 			remark: Default::default()
 		}.into();

xcm/pallet-xcm-benchmarks/src/generic/mock.rs

@@ -128,6 +128,10 @@ impl generic::Config for Test {
 		let assets: MultiAssets = (Concrete(Here.into()), 100).into();
 		(0, Response::Assets(assets))
 	}
+
+	fn transact_origin() -> Option<MultiLocation> {
+		Some(Default::default())
+	}
 }
 
 pub fn new_test_ext() -> sp_io::TestExternalities {

xcm/pallet-xcm-benchmarks/src/generic/mod.rs

@@ -7,7 +7,7 @@ mod mock;
 #[frame_support::pallet]
 pub mod pallet {
 	use frame_support::{dispatch::Dispatchable, pallet_prelude::Encode, weights::GetDispatchInfo};
-	use xcm::latest::Response;
+	use xcm::latest::{MultiLocation, Response};
 
 	#[pallet::config]
 	pub trait Config<I: 'static = ()>: frame_system::Config + crate::Config {
@@ -17,6 +17,8 @@ pub mod pallet {
 			+ Encode;
 
 		fn worst_case_response() -> (u64, Response);
+
+		fn transact_origin() -> Option<MultiLocation>;
 	}
 
 	#[pallet::pallet]