patch up bounties benchmarks

frame/bounties/src/benchmarking.rs

@@ -21,25 +21,26 @@
 
 use super::*;
 
-use frame_system::RawOrigin;
+use sp_runtime::traits::Bounded;
+use frame_system::{EventRecord, RawOrigin};
 use frame_benchmarking::{benchmarks, account, whitelisted_caller};
 use frame_support::traits::OnInitialize;
 
 use crate::Module as Bounties;
 
 const SEED: u32 = 0;
 
-// // Create bounties that are approved for use in `on_initialize`.
-// fn create_approved_bounties<T: Trait<I>, I: Instance>(n: u32) -> Result<(), &'static str> {
-// 	for i in 0 .. n {
-// 		let (caller, _curator, _fee, value, reason) = setup_bounty::<T>(i, MAX_BYTES);
-// 		Bounties::<T>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
-// 		let bounty_id = BountyCount::get() - 1;
-// 		Bounties::<T>::approve_bounty(RawOrigin::Root.into(), bounty_id)?;
-// 	}
-// 	ensure!(BountyApprovals::get().len() == n as usize, "Not all bounty approved");
-// 	Ok(())
-// }
+// Create bounties that are approved for use in `on_initialize`.
+fn create_approved_bounties<T: Trait>(n: u32) -> Result<(), &'static str> {
+	for i in 0 .. n {
+		let (caller, _curator, _fee, value, reason) = setup_bounty::<T>(i, MAX_BYTES);
+		Bounties::<T>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
+		let bounty_id = BountyCount::get() - 1;
+		Bounties::<T>::approve_bounty(RawOrigin::Root.into(), bounty_id)?;
+	}
+	ensure!(BountyApprovals::get().len() == n as usize, "Not all bounty approved");
+	Ok(())
+}
 
 // Create the pre-requisite information needed to create a treasury `propose_bounty`.
 fn setup_bounty<T: Trait>(u: u32, d: u32) -> (
@@ -81,6 +82,14 @@ fn setup_pod_account<T: Trait>() {
 	let _ = T::Currency::make_free_balance_be(&pot_account, value);
 }
 
+fn assert_last_event<T: Trait>(generic_event: <T as Trait>::Event) {
+	let events = frame_system::Module::<T>::events();
+	let system_event: <T as frame_system::Trait>::Event = generic_event.into();
+	// compare to the last event record
+	let EventRecord { event, .. } = &events[events.len() - 1];
+	assert_eq!(event, &system_event);
+}
+
 const MAX_BYTES: u32 = 16384;
 
 benchmarks! {
@@ -167,6 +176,9 @@ benchmarks! {
 		Bounties::<T>::on_initialize(T::BlockNumber::zero());
 		let bounty_id = BountyCount::get() - 1;
 	}: close_bounty(RawOrigin::Root, bounty_id)
+	verify {
+		assert_last_event::<T>(RawEvent::BountyCanceled(bounty_id).into())
+	}
 
 	extend_bounty_expiry {
 		setup_pod_account::<T>();
@@ -176,13 +188,31 @@ benchmarks! {
 		let bounty_id = BountyCount::get() - 1;
 		let curator = T::Lookup::lookup(curator_lookup)?;
 	}: _(RawOrigin::Signed(curator), bounty_id, Vec::new())
+	verify {
+		assert_last_event::<T>(RawEvent::BountyExtended(bounty_id).into())
+	}
 
-	on_initialize_bounties {
-		let b in 0 .. 100;
-		setup_pod_account::<T, _>();
-		create_approved_bounties::<T, _>(b)?;
+	spend_funds {
+		let b in 1 .. 100;
+		setup_pod_account::<T>();
+		create_approved_bounties::<T>(b)?;
+
+		let mut budget_remaining = BalanceOf::<T>::max_value();
+		let mut imbalance = PositiveImbalanceOf::<T>::zero();
+		let mut total_weight = Weight::zero();
+		let mut missed_any = false;
 	}: {
-		Treasury::<T, _>::on_initialize(T::BlockNumber::zero());
+		<Bounties<T> as pallet_treasury::SpendFunds<T>>::spend_funds(
+			&mut budget_remaining,
+			&mut imbalance,
+			&mut total_weight,
+			&mut missed_any,
+		);
+	}
+	verify {
+		ensure!(budget_remaining < BalanceOf::<T>::max_value(), "Budget not used");
+		ensure!(missed_any == false, "Missed some");
+		assert_last_event::<T>(RawEvent::BountyBecameActive(b - 1).into())
 	}
 }
 
@@ -205,7 +235,7 @@ mod tests {
 			assert_ok!(test_benchmark_close_bounty_proposed::<Test>());
 			assert_ok!(test_benchmark_close_bounty_active::<Test>());
 			assert_ok!(test_benchmark_extend_bounty_expiry::<Test>());
-			assert_ok!(test_benchmark_on_initialize_bounties::<Test>());
+			assert_ok!(test_benchmark_spend_funds::<Test>());
 		});
 	}
 }

frame/bounties/src/lib.rs

@@ -779,12 +779,12 @@ impl<T: Trait> Module<T> {
 }
 
 impl<T: Trait> pallet_treasury::SpendFunds<T> for Module<T> {
-
-	fn spend_funds( budget_remaining: &mut BalanceOf<T>,
-					imbalance: &mut PositiveImbalanceOf<T>,
-					total_weight: &mut Weight,
-					missed_any: &mut bool ) {
-
+	fn spend_funds(
+		budget_remaining: &mut BalanceOf<T>,
+		imbalance: &mut PositiveImbalanceOf<T>,
+		total_weight: &mut Weight,
+		missed_any: &mut bool
+	) {
 		let bounties_len = BountyApprovals::mutate(|v| {
 			let bounties_approval_len = v.len() as u32;
 			v.retain(|&index| {
@@ -816,7 +816,7 @@ impl<T: Trait> pallet_treasury::SpendFunds<T> for Module<T> {
 			bounties_approval_len
 		});
 
-		*total_weight += <T as Trait>::WeightInfo::on_initialize_bounties(bounties_len);
+		*total_weight += <T as Trait>::WeightInfo::spend_funds(bounties_len);
 	}
 
 }

frame/bounties/src/tests.rs

@@ -103,28 +103,6 @@ impl pallet_balances::Trait for Test {
 thread_local! {
 	static TEN_TO_FOURTEEN: RefCell<Vec<u128>> = RefCell::new(vec![10,11,12,13,14]);
 }
-pub struct TenToFourteen;
-impl Contains<u128> for TenToFourteen {
-	fn sorted_members() -> Vec<u128> {
-		TEN_TO_FOURTEEN.with(|v| {
-			v.borrow().clone()
-		})
-	}
-	#[cfg(feature = "runtime-benchmarks")]
-	fn add(new: &u128) {
-		TEN_TO_FOURTEEN.with(|v| {
-			let mut members = v.borrow_mut();
-			members.push(*new);
-			members.sort();
-		})
-	}
-}
-impl ContainsLengthBound for TenToFourteen {
-	fn max_len() -> usize {
-		TEN_TO_FOURTEEN.with(|v| v.borrow().len())
-	}
-	fn min_len() -> usize { 0 }
-}
 parameter_types! {
 	pub const ProposalBond: Permill = Permill::from_percent(5);
 	pub const ProposalBondMinimum: u64 = 1;

frame/bounties/src/weights.rs

@@ -54,7 +54,7 @@ pub trait WeightInfo {
 	fn close_bounty_proposed() -> Weight;
 	fn close_bounty_active() -> Weight;
 	fn extend_bounty_expiry() -> Weight;
-	fn on_initialize_bounties(b: u32, ) -> Weight;
+	fn spend_funds(b: u32, ) -> Weight;
 }
 
 /// Weights for pallet_bounties using the Substrate node and recommended hardware.
@@ -111,7 +111,7 @@ impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(1 as Weight))
 			.saturating_add(T::DbWeight::get().writes(1 as Weight))
 	}
-	fn on_initialize_bounties(b: u32, ) -> Weight {
+	fn spend_funds(b: u32, ) -> Weight {
 		(75_165_000 as Weight)
 			.saturating_add((73_634_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(T::DbWeight::get().reads(2 as Weight))
@@ -174,7 +174,7 @@ impl WeightInfo for () {
 			.saturating_add(RocksDbWeight::get().reads(1 as Weight))
 			.saturating_add(RocksDbWeight::get().writes(1 as Weight))
 	}
-	fn on_initialize_bounties(b: u32, ) -> Weight {
+	fn spend_funds(b: u32, ) -> Weight {
 		(75_165_000 as Weight)
 			.saturating_add((73_634_000 as Weight).saturating_mul(b as Weight))
 			.saturating_add(RocksDbWeight::get().reads(2 as Weight))