change option to result with benchmark error

runtime/westend/src/lib.rs

@@ -1563,7 +1563,7 @@ sp_api::impl_runtime_apis! {
 			impl pallet_xcm_benchmarks::Config for Runtime {
 				type XcmConfig = XcmConfig;
 				type AccountIdConverter = LocationConverter;
-				fn valid_destination() -> Result<MultiLocation, sp_runtime::DispatchError> {
+				fn valid_destination() -> Result<MultiLocation, BenchmarkError> {
 					Ok(Westmint::get())
 				}
 				fn worst_case_holding() -> MultiAssets {
@@ -1603,19 +1603,19 @@ sp_api::impl_runtime_apis! {
 					(0u64, Response::Version(Default::default()))
 				}
 
-				fn transact_origin() -> Option<MultiLocation> {
-					Some(Westmint::get())
+				fn transact_origin() -> Result<MultiLocation, BenchmarkError> {
+					Ok(Westmint::get())
 				}
 
-				fn subscribe_origin() -> Option<MultiLocation> {
-					Some(Westmint::get())
+				fn subscribe_origin() -> Result<MultiLocation, BenchmarkError> {
+					Ok(Westmint::get())
 				}
 
-				fn claimable_asset() -> Option<(MultiLocation, MultiLocation, MultiAssets)> {
+				fn claimable_asset() -> Result<(MultiLocation, MultiLocation, MultiAssets), BenchmarkError> {
 					let origin = Westmint::get();
 					let assets: MultiAssets = (Concrete(WndLocation::get()), 1_000 * UNITS).into();
 					let ticket = MultiLocation { parents: 0, interior: Here };
-					Some((origin, ticket, assets))
+					Ok((origin, ticket, assets))
 				}
 			}
 

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

@@ -26,6 +26,7 @@ use sp_runtime::{
 };
 use xcm::latest::prelude::*;
 use xcm_builder::AllowUnpaidExecutionFrom;
+use frame_benchmarking::BenchmarkError;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -145,7 +146,7 @@ impl xcm_executor::Config for XcmConfig {
 impl crate::Config for Test {
 	type XcmConfig = XcmConfig;
 	type AccountIdConverter = AccountIdConverter;
-	fn valid_destination() -> Result<MultiLocation, sp_runtime::DispatchError> {
+	fn valid_destination() -> Result<MultiLocation, BenchmarkError> {
 		let valid_destination: MultiLocation =
 			X1(AccountId32 { network: NetworkId::Any, id: [0u8; 32] }).into();
 

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

@@ -106,7 +106,7 @@ benchmarks! {
 	// and included in the final weight calculation. So this is just the overhead of submitting
 	// a noop call.
 	transact {
-		let origin = T::transact_origin().ok_or(BenchmarkError::Skip)?;
+		let origin = T::transact_origin()?;
 		let mut executor = new_executor::<T>(origin);
 		let noop_call: <T as Config>::Call = frame_system::Call::remark_with_event {
 			remark: Default::default()
@@ -222,8 +222,7 @@ benchmarks! {
 	claim_asset {
 		use xcm_executor::traits::DropAssets;
 
-		let (origin, ticket, assets) = T::claimable_asset()
-			.ok_or(BenchmarkError::Skip)?;
+		let (origin, ticket, assets) = T::claimable_asset()?;
 
 		// We place some items into the asset trap to claim.
 		<T::XcmConfig as xcm_executor::Config>::AssetTrap::drop_assets(
@@ -261,7 +260,7 @@ benchmarks! {
 
 	subscribe_version {
 		use xcm_executor::traits::VersionChangeNotifier;
-		let origin = T::subscribe_origin().ok_or(BenchmarkError::Skip)?;
+		let origin = T::subscribe_origin()?;
 		let query_id = Default::default();
 		let max_response_weight = Default::default();
 		let mut executor = new_executor::<T>(origin.clone());
@@ -276,7 +275,7 @@ benchmarks! {
 	unsubscribe_version {
 		use xcm_executor::traits::VersionChangeNotifier;
 		// First we need to subscribe to notifications.
-		let origin = T::transact_origin().ok_or(BenchmarkError::Skip)?;
+		let origin = T::transact_origin()?;
 		let query_id = Default::default();
 		let max_response_weight = Default::default();
 		<T::XcmConfig as xcm_executor::Config>::SubscriptionService::start(

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

@@ -116,7 +116,7 @@ impl xcm_executor::Config for XcmConfig {
 impl crate::Config for Test {
 	type XcmConfig = XcmConfig;
 	type AccountIdConverter = AccountIdConverter;
-	fn valid_destination() -> Result<MultiLocation, sp_runtime::DispatchError> {
+	fn valid_destination() -> Result<MultiLocation, BenchmarkError> {
 		let valid_destination: MultiLocation =
 			Junction::AccountId32 { network: NetworkId::Any, id: [0u8; 32] }.into();
 
@@ -135,18 +135,18 @@ impl generic::Config for Test {
 		(0, Response::Assets(assets))
 	}
 
-	fn transact_origin() -> Option<MultiLocation> {
-		Some(Default::default())
+	fn transact_origin() -> Result<MultiLocation, BenchmarkError> {
+		Ok(Default::default())
 	}
 
-	fn subscribe_origin() -> Option<MultiLocation> {
-		Some(Default::default())
+	fn subscribe_origin() -> Result<MultiLocation, BenchmarkError> {
+		Ok(Default::default())
 	}
 
-	fn claimable_asset() -> Option<(MultiLocation, MultiLocation, MultiAssets)> {
+	fn claimable_asset() -> Result<(MultiLocation, MultiLocation, MultiAssets), BenchmarkError> {
 		let assets: MultiAssets = (Concrete(Here.into()), 100).into();
 		let ticket = MultiLocation { parents: 0, interior: X1(GeneralIndex(0)) };
-		Some((Default::default(), ticket, assets))
+		Ok((Default::default(), ticket, assets))
 	}
 }
 

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

@@ -8,6 +8,7 @@ mod mock;
 pub mod pallet {
 	use frame_support::{dispatch::Dispatchable, pallet_prelude::Encode, weights::GetDispatchInfo};
 	use xcm::latest::{MultiAssets, MultiLocation, Response};
+	use frame_benchmarking::BenchmarkError;
 
 	#[pallet::config]
 	pub trait Config<I: 'static = ()>: frame_system::Config + crate::Config {
@@ -22,15 +23,15 @@ pub mod pallet {
 		/// The `MultiLocation` used for successful transaction XCMs.
 		///
 		/// If set to `None`, benchmarks which rely on a `transact_origin` will be skipped.
-		fn transact_origin() -> Option<MultiLocation>;
+		fn transact_origin() -> Result<MultiLocation, BenchmarkError>;
 
 		/// A valid `MultiLocation` we can successfully subscribe to.
 		///
 		/// If set to `None`, benchmarks which rely on a `subscribe_origin` will be skipped.
-		fn subscribe_origin() -> Option<MultiLocation>;
+		fn subscribe_origin() -> Result<MultiLocation, BenchmarkError>;
 
 		/// Return an origin, ticket, and assets that can be trapped and claimed.
-		fn claimable_asset() -> Option<(MultiLocation, MultiLocation, MultiAssets)>;
+		fn claimable_asset() -> Result<(MultiLocation, MultiLocation, MultiAssets), BenchmarkError>;
 	}
 
 	#[pallet::pallet]

xcm/pallet-xcm-benchmarks/src/lib.rs

@@ -19,7 +19,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::Encode;
-use frame_benchmarking::account;
+use frame_benchmarking::{account, BenchmarkError};
 use sp_std::prelude::*;
 use xcm::latest::prelude::*;
 use xcm_executor::traits::Convert;
@@ -43,7 +43,7 @@ pub trait Config: frame_system::Config {
 
 	/// Does any necessary setup to create a valid destination for XCM messages.
 	/// Returns that destination's multi-location to be used in benchmarks.
-	fn valid_destination() -> Result<MultiLocation, sp_runtime::DispatchError>;
+	fn valid_destination() -> Result<MultiLocation, BenchmarkError>;
 
 	/// Worst case scenario for a holding account in this runtime.
 	fn worst_case_holding() -> MultiAssets;