pallet-bounties: defaults to curator if RejectOrigin is unavailable

Author: BigTava

substrate/frame/bounties/src/benchmarking.rs

@@ -156,14 +156,14 @@ benchmarks_instance_pallet! {
 		let bounty_update_period = T::BountyUpdatePeriod::get();
 		let inactivity_timeout = T::SpendPeriod::get().saturating_add(bounty_update_period);
 		set_block_number::<T, I>(inactivity_timeout.saturating_add(2u32.into()));
-		let caller: T::AccountId = whitelisted_caller();
-		let signed_caller: T::RuntimeOrigin = RawOrigin::Signed(caller.clone()).into();
 
 		// If `BountyUpdatePeriod` overflows the inactivity timeout the benchmark still executes the slash
 		let origin = if Pallet::<T, I>::treasury_block_number() <= inactivity_timeout {
-			T::RejectOrigin::try_successful_origin().unwrap_or_else(|_| signed_caller)
+			let curator = T::Lookup::lookup(curator_lookup).map_err(<&str>::from)?;
+			T::RejectOrigin::try_successful_origin().unwrap_or_else(|_| RawOrigin::Signed(curator).into())
 		} else {
-			signed_caller
+			let caller = whitelisted_caller();
+			RawOrigin::Signed(caller).into()
 		};
 	}: _<T::RuntimeOrigin>(origin, bounty_id)
 

substrate/frame/child-bounties/src/benchmarking.rs

@@ -277,15 +277,17 @@ mod benchmarks {
 		let bounty_update_period = T::BountyUpdatePeriod::get();
 		let inactivity_timeout = T::SpendPeriod::get().saturating_add(bounty_update_period);
 		set_block_number::<T>(inactivity_timeout.saturating_add(1u32.into()));
-		let caller: T::AccountId = whitelisted_caller();
-		let signed_caller: T::RuntimeOrigin = RawOrigin::Signed(caller.clone()).into();
 
 		// If `BountyUpdatePeriod` overflows the inactivity timeout the benchmark still
 		// executes the slash
-		let origin = if Pallet::<T>::treasury_block_number() <= inactivity_timeout {
-			T::RejectOrigin::try_successful_origin().unwrap_or_else(|_| signed_caller)
+		let origin: T::RuntimeOrigin = if Pallet::<T>::treasury_block_number() <= inactivity_timeout
+		{
+			let child_curator = bounty_setup.child_curator;
+			T::RejectOrigin::try_successful_origin()
+				.unwrap_or_else(|_| RawOrigin::Signed(child_curator).into())
 		} else {
-			signed_caller
+			let caller = whitelisted_caller();
+			RawOrigin::Signed(caller).into()
 		};
 
 		#[extrinsic_call]