fix treasury benchmarks when no SpendOrigin

paritytech · Jan 24, 2024 · 20c2e85 · 20c2e85
1 parent a78ff7d
commit 20c2e85
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/substrate/frame/treasury/src/benchmarking.rs b/substrate/frame/treasury/src/benchmarking.rs
@@ -215,6 +215,8 @@ mod benchmarks {
 		Ok(())
 	}
 
+	// This benchmark is short-circuited if `SpendOrigin` cannot provide
+	// a successful origin, in which case `spend` is un-callable and can use weight=0.
 	#[benchmark]
 	fn spend() -> Result<(), BenchmarkError> {
 		let origin =
@@ -248,9 +250,12 @@ mod benchmarks {
 		Ok(())
 	}
 
+	// This benchmark is short-circuited if `SpendOrigin` cannot provide
+	// a successful origin, in which case there is no spend to payout.
 	#[benchmark]
 	fn payout() -> Result<(), BenchmarkError> {
-		let origin = T::SpendOrigin::try_successful_origin().map_err(|_| "No origin")?;
+		let origin =
+			T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
 		let (asset_kind, amount, beneficiary, beneficiary_lookup) =
 			create_spend_arguments::<T, _>(SEED);
 		T::BalanceConverter::ensure_successful(asset_kind.clone());
@@ -279,9 +284,12 @@ mod benchmarks {
 		Ok(())
 	}
 
+	// This benchmark is short-circuited if `SpendOrigin` cannot provide
+	// a successful origin, in which case there is no spend to check.
 	#[benchmark]
 	fn check_status() -> Result<(), BenchmarkError> {
-		let origin = T::SpendOrigin::try_successful_origin().map_err(|_| "No origin")?;
+		let origin =
+			T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
 		let (asset_kind, amount, beneficiary, beneficiary_lookup) =
 			create_spend_arguments::<T, _>(SEED);
 		T::BalanceConverter::ensure_successful(asset_kind.clone());
@@ -311,9 +319,12 @@ mod benchmarks {
 		Ok(())
 	}
 
+	// This benchmark is short-circuited if `SpendOrigin` cannot provide
+	// a successful origin, in which case there is no spend to void.
 	#[benchmark]
 	fn void_spend() -> Result<(), BenchmarkError> {
-		let origin = T::SpendOrigin::try_successful_origin().map_err(|_| "No origin")?;
+		let origin =
+			T::SpendOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
 		let (asset_kind, amount, _, beneficiary_lookup) = create_spend_arguments::<T, _>(SEED);
 		T::BalanceConverter::ensure_successful(asset_kind.clone());
 		Treasury::<T, _>::spend(

diff --git a/substrate/frame/treasury/src/lib.rs b/substrate/frame/treasury/src/lib.rs
@@ -810,6 +810,7 @@ pub mod pallet {
 		#[pallet::call_index(6)]
 		#[pallet::weight(T::WeightInfo::payout())]
 		pub fn payout(origin: OriginFor<T>, index: SpendIndex) -> DispatchResult {
+			T::SpendOrigin::ensure_origin(origin.clone())?;
 			ensure_signed(origin)?;
 			let mut spend = Spends::<T, I>::get(index).ok_or(Error::<T, I>::InvalidIndex)?;
 			let now = frame_system::Pallet::<T>::block_number();
@@ -856,6 +857,7 @@ pub mod pallet {
 			use PaymentState as State;
 			use PaymentStatus as Status;
 
+			T::SpendOrigin::ensure_origin(origin.clone())?;
 			ensure_signed(origin)?;
 			let mut spend = Spends::<T, I>::get(index).ok_or(Error::<T, I>::InvalidIndex)?;
 			let now = frame_system::Pallet::<T>::block_number();
@@ -907,6 +909,7 @@ pub mod pallet {
 		#[pallet::call_index(8)]
 		#[pallet::weight(T::WeightInfo::void_spend())]
 		pub fn void_spend(origin: OriginFor<T>, index: SpendIndex) -> DispatchResult {
+			T::SpendOrigin::ensure_origin(origin.clone())?;
 			T::RejectOrigin::ensure_origin(origin)?;
 			let spend = Spends::<T, I>::get(index).ok_or(Error::<T, I>::InvalidIndex)?;
 			ensure!(