pallet-bounties: refactor unassign_curator benchmark to always perform worst case even if BountyUpdatePeriod is max

Author: BigTava

substrate/frame/bounties/src/benchmarking.rs

@@ -146,7 +146,8 @@ benchmarks_instance_pallet! {
 		);
 	}
 
-	// Worst case when curator is inactive and any sender unassigns the curator.
+	// Worst case when curator is inactive and any sender unassigns the curator, 
+	// or if `BountyUpdatePeriod` is large enough and `RejectOrigin` executes the call.
 	unassign_curator {
 		setup_pot_account::<T, I>();
 		let (curator_lookup, bounty_id) = create_bounty::<T, I>()?;
@@ -155,18 +156,15 @@ 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 = whitelisted_caller();
-	}: {
-		let res = Pallet::<T, I>::unassign_curator(RawOrigin::Signed(caller).into(), bounty_id);
 
-		// If `BountyUpdatePeriod` overflowed the inactivity timeout, the call will fail (which is fine)
-		// but we need to handle it.
-		if Pallet::<T, I>::treasury_block_number() <= inactivity_timeout {
-			  assert!(res.is_err());
+		// 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().map_err(|_| BenchmarkError::Weightless)?
 		} else {
-			  res?;
-		}
-	}
+			let caller: T::AccountId = whitelisted_caller();
+			RawOrigin::Signed(caller.clone()).into()
+		};
+	}: _<T::RuntimeOrigin>(origin, bounty_id)
 
 	accept_curator {
 		setup_pot_account::<T, I>();

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

@@ -267,7 +267,8 @@ mod benchmarks {
 		Ok(())
 	}
 
-	// Worst case when curator is inactive and any sender un-assigns the curator.
+	// Worst case when curator is inactive and any sender un-assigns the curator,
+	// or if `BountyUpdatePeriod` is large enough and `RejectOrigin` executes the call.
 	#[benchmark]
 	fn unassign_curator() -> Result<(), BenchmarkError> {
 		setup_pot_account::<T>();
@@ -276,24 +277,21 @@ 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();
-
-		#[block]
-		{
-			let res = Pallet::<T>::unassign_curator(
-				RawOrigin::Signed(caller).into(),
-				bounty_setup.bounty_id,
-				bounty_setup.child_bounty_id,
-			);
-
-			// If `BountyUpdatePeriod` overflowed the inactivity timeout, the call will fail (which
-			// is fine) but we need to handle it.
-			if Pallet::<T>::treasury_block_number() <= inactivity_timeout {
-				assert!(res.is_err());
-			} else {
-				assert_ok!(res);
-			}
-		}
+
+		// 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().map_err(|_| BenchmarkError::Weightless)?
+		} else {
+			let caller: T::AccountId = whitelisted_caller();
+			RawOrigin::Signed(caller.clone()).into()
+		};
+
+		#[extrinsic_call]
+		_(
+			origin as T::RuntimeOrigin,
+			bounty_setup.bounty_id,
+			bounty_setup.child_bounty_id,
+		);
 
 		Ok(())
 	}