Migrate pallet-democracy benchmarks to benchmark v2 syntax

substrate/frame/democracy/src/benchmarking.rs

@@ -17,9 +17,11 @@
 
 //! Democracy pallet benchmarking.
 
+#![cfg(feature = "runtime-benchmarks")]
+
 use super::*;
 
-use frame_benchmarking::v1::{account, benchmarks, whitelist_account, BenchmarkError};
+use frame_benchmarking::v2::*;
 use frame_support::{
 	assert_noop, assert_ok,
 	traits::{Currency, EnsureOrigin, Get, OnInitialize, UnfilteredDispatchable},
@@ -94,8 +96,12 @@ fn note_preimage<T: Config>() -> T::Hash {
 	hash
 }
 
-benchmarks! {
-	propose {
+#[benchmarks]
+mod benchmarks {
+	use super::*;
+
+	#[benchmark]
+	fn propose() -> Result<(), BenchmarkError> {
 		let p = T::MaxProposals::get();
 
 		for i in 0 .. (p - 1) {
@@ -106,12 +112,16 @@ benchmarks! {
 		let proposal = make_proposal::<T>(0);
 		let value = T::MinimumDeposit::get();
 		whitelist_account!(caller);
-	}: _(RawOrigin::Signed(caller), proposal, value)
-	verify {
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller), proposal, value);
+
 		assert_eq!(PublicProps::<T>::get().len(), p as usize, "Proposals not created.");
+		Ok(())
 	}
 
-	second {
+	#[benchmark]
+	fn second() -> Result<(), BenchmarkError> {
 		let caller = funded_account::<T>("caller", 0);
 		add_proposal::<T>(0)?;
 
@@ -125,13 +135,18 @@ benchmarks! {
 		let deposits = DepositOf::<T>::get(0).ok_or("Proposal not created")?;
 		assert_eq!(deposits.0.len(), (T::MaxDeposits::get() - 1) as usize, "Seconds not recorded");
 		whitelist_account!(caller);
-	}: _(RawOrigin::Signed(caller), 0)
-	verify {
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller), 0);
+
+
 		let deposits = DepositOf::<T>::get(0).ok_or("Proposal not created")?;
 		assert_eq!(deposits.0.len(), (T::MaxDeposits::get()) as usize, "`second` benchmark did not work");
+		Ok(())
 	}
 
-	vote_new {
+	#[benchmark]
+	fn vote_new() -> Result<(), BenchmarkError> {
 		let caller = funded_account::<T>("caller", 0);
 		let account_vote = account_vote::<T>(100u32.into());
 
@@ -148,16 +163,21 @@ benchmarks! {
 
 		let ref_index = add_referendum::<T>(T::MaxVotes::get() - 1).0;
 		whitelist_account!(caller);
-	}: vote(RawOrigin::Signed(caller.clone()), ref_index, account_vote)
-	verify {
+
+		#[extrinsic_call]
+		vote(RawOrigin::Signed(caller.clone()), ref_index, account_vote);
+
 		let votes = match VotingOf::<T>::get(&caller) {
 			Voting::Direct { votes, .. } => votes,
 			_ => return Err("Votes are not direct".into()),
 		};
+
 		assert_eq!(votes.len(), T::MaxVotes::get() as usize, "Vote was not recorded.");
+		Ok(())
 	}
 
-	vote_existing {
+	#[benchmark]
+	fn vote_existing() -> Result<(), BenchmarkError> {
 		let caller = funded_account::<T>("caller", 0);
 		let account_vote = account_vote::<T>(100u32.into());
 
@@ -179,8 +199,10 @@ benchmarks! {
 
 		// This tests when a user changes a vote
 		whitelist_account!(caller);
-	}: vote(RawOrigin::Signed(caller.clone()), ref_index, new_vote)
-	verify {
+
+		#[extrinsic_call]
+		vote(RawOrigin::Signed(caller.clone()), ref_index, new_vote);
+
 		let votes = match VotingOf::<T>::get(&caller) {
 			Voting::Direct { votes, .. } => votes,
 			_ => return Err("Votes are not direct".into()),
@@ -193,8 +215,9 @@ benchmarks! {
 			_ => return Err("referendum not ongoing".into()),
 		};
 		assert_eq!(tally.nays, 1000u32.into(), "changed vote was not recorded");
+		Ok(())
 	}
-
+/*
 	emergency_cancel {
 		let origin =
 			T::CancellationOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
@@ -845,7 +868,7 @@ benchmarks! {
 			hash,
 		}.into());
 	}
-
+*/
 	impl_benchmark_test_suite!(
 		Democracy,
 		crate::tests::new_test_ext(),