Revert "Referendum proposal's metadata (#12568)"

This reverts commit ae03716.

Author: Ross Bulat

frame/democracy/src/benchmarking.rs

@@ -54,20 +54,19 @@ fn add_proposal<T: Config>(n: u32) -> Result<H256, &'static str> {
 	Ok(proposal.hash())
 }
 
-// add a referendum with a metadata.
-fn add_referendum<T: Config>(n: u32) -> (ReferendumIndex, H256, PreimageHash) {
+fn add_referendum<T: Config>(n: u32) -> (ReferendumIndex, H256) {
 	let vote_threshold = VoteThreshold::SimpleMajority;
 	let proposal = make_proposal::<T>(n);
 	let hash = proposal.hash();
-	let index = Democracy::<T>::inject_referendum(
-		T::LaunchPeriod::get(),
-		proposal,
-		vote_threshold,
-		0u32.into(),
-	);
-	let preimage_hash = note_preimage::<T>();
-	MetadataOf::<T>::insert(crate::MetadataOwner::Referendum(index), preimage_hash.clone());
-	(index, hash, preimage_hash)
+	(
+		Democracy::<T>::inject_referendum(
+			T::LaunchPeriod::get(),
+			proposal,
+			vote_threshold,
+			0u32.into(),
+		),
+		hash,
+	)
 }
 
 fn account_vote<T: Config>(b: BalanceOf<T>) -> AccountVote<BalanceOf<T>> {
@@ -76,25 +75,6 @@ fn account_vote<T: Config>(b: BalanceOf<T>) -> AccountVote<BalanceOf<T>> {
 	AccountVote::Standard { vote: v, balance: b }
 }
 
-fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
-	frame_system::Pallet::<T>::assert_last_event(generic_event.into());
-}
-
-fn assert_has_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
-	frame_system::Pallet::<T>::assert_has_event(generic_event.into());
-}
-
-// note a new preimage.
-fn note_preimage<T: Config>() -> PreimageHash {
-	use core::sync::atomic::{AtomicU8, Ordering};
-	use sp_std::borrow::Cow;
-	// note a new preimage on every function invoke.
-	static COUNTER: AtomicU8 = AtomicU8::new(0);
-	let data = Cow::from(vec![COUNTER.fetch_add(1, Ordering::Relaxed)]);
-	let hash = <T as Config>::Preimages::note(data).unwrap();
-	hash
-}
-
 benchmarks! {
 	propose {
 		let p = T::MaxProposals::get();
@@ -199,7 +179,7 @@ benchmarks! {
 	emergency_cancel {
 		let origin =
 			T::CancellationOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
-		let (ref_index, _, preimage_hash) = add_referendum::<T>(0);
+		let ref_index = add_referendum::<T>(0).0;
 		assert_ok!(Democracy::<T>::referendum_status(ref_index));
 	}: _<T::RuntimeOrigin>(origin, ref_index)
 	verify {
@@ -208,10 +188,6 @@ benchmarks! {
 			Democracy::<T>::referendum_status(ref_index),
 			Error::<T>::ReferendumInvalid,
 		);
-		assert_last_event::<T>(crate::Event::MetadataCleared {
-			owner: MetadataOwner::Referendum(ref_index),
-			hash: preimage_hash,
-		}.into());
 	}
 
 	blacklist {
@@ -222,7 +198,7 @@ benchmarks! {
 		// We should really add a lot of seconds here, but we're not doing it elsewhere.
 
 		// Add a referendum of our proposal.
-		let (ref_index, hash, preimage_hash) = add_referendum::<T>(0);
+		let (ref_index, hash) = add_referendum::<T>(0);
 		assert_ok!(Democracy::<T>::referendum_status(ref_index));
 		// Place our proposal in the external queue, too.
 		assert_ok!(Democracy::<T>::external_propose(
@@ -239,10 +215,6 @@ benchmarks! {
 			Democracy::<T>::referendum_status(ref_index),
 			Error::<T>::ReferendumInvalid
 		);
-		assert_has_event::<T>(crate::Event::MetadataCleared {
-			owner: MetadataOwner::Referendum(ref_index),
-			hash: preimage_hash,
-		}.into());
 	}
 
 	// Worst case scenario, we external propose a previously blacklisted proposal
@@ -290,26 +262,16 @@ benchmarks! {
 			.expect("ExternalDefaultOrigin has no successful origin required for the benchmark");
 		let proposal = make_proposal::<T>(0);
 		let proposal_hash = proposal.hash();
-		Democracy::<T>::external_propose_default(origin_propose.clone(), proposal)?;
-		// Set metadata to the external proposal.
-		let preimage_hash = note_preimage::<T>();
-		assert_ok!(Democracy::<T>::set_metadata(
-			origin_propose,
-			MetadataOwner::External,
-			Some(preimage_hash)));
+		Democracy::<T>::external_propose_default(origin_propose, proposal)?;
+
 		// NOTE: Instant origin may invoke a little bit more logic, but may not always succeed.
 		let origin_fast_track =
 			T::FastTrackOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
 		let voting_period = T::FastTrackVotingPeriod::get();
 		let delay = 0u32;
 	}: _<T::RuntimeOrigin>(origin_fast_track, proposal_hash, voting_period, delay.into())
 	verify {
-		assert_eq!(Democracy::<T>::referendum_count(), 1, "referendum not created");
-		assert_last_event::<T>(crate::Event::MetadataTransferred {
-			prev_owner: MetadataOwner::External,
-			owner: MetadataOwner::Referendum(0),
-			hash: preimage_hash,
-		}.into());
+		assert_eq!(Democracy::<T>::referendum_count(), 1, "referendum not created")
 	}
 
 	veto_external {
@@ -318,14 +280,7 @@ benchmarks! {
 
 		let origin_propose = T::ExternalDefaultOrigin::try_successful_origin()
 			.expect("ExternalDefaultOrigin has no successful origin required for the benchmark");
-		Democracy::<T>::external_propose_default(origin_propose.clone(), proposal)?;
-
-		let preimage_hash = note_preimage::<T>();
-		assert_ok!(Democracy::<T>::set_metadata(
-			origin_propose,
-			MetadataOwner::External,
-			Some(preimage_hash))
-		);
+		Democracy::<T>::external_propose_default(origin_propose, proposal)?;
 
 		let mut vetoers: BoundedVec<T::AccountId, _> = Default::default();
 		for i in 0 .. (T::MaxBlacklisted::get() - 1) {
@@ -348,32 +303,13 @@ benchmarks! {
 		for i in 0 .. T::MaxProposals::get() {
 			add_proposal::<T>(i)?;
 		}
-		// Add metadata to the first proposal.
-		let proposer = funded_account::<T>("proposer", 0);
-		let preimage_hash = note_preimage::<T>();
-		assert_ok!(Democracy::<T>::set_metadata(
-			RawOrigin::Signed(proposer).into(),
-			MetadataOwner::Proposal(0),
-			Some(preimage_hash)));
 		let cancel_origin = T::CancelProposalOrigin::try_successful_origin()
 			.map_err(|_| BenchmarkError::Weightless)?;
 	}: _<T::RuntimeOrigin>(cancel_origin, 0)
-	verify {
-		assert_last_event::<T>(crate::Event::MetadataCleared {
-			owner: MetadataOwner::Proposal(0),
-			hash: preimage_hash,
-		}.into());
-	}
 
 	cancel_referendum {
-		let (ref_index, _, preimage_hash) = add_referendum::<T>(0);
+		let ref_index = add_referendum::<T>(0).0;
 	}: _(RawOrigin::Root, ref_index)
-	verify {
-		assert_last_event::<T>(crate::Event::MetadataCleared {
-			owner: MetadataOwner::Referendum(0),
-			hash: preimage_hash,
-		}.into());
-	}
 
 	#[extra]
 	on_initialize_external {
@@ -742,111 +678,6 @@ benchmarks! {
 		assert_eq!(votes.len(), (r - 1) as usize, "Vote was not removed");
 	}
 
-	set_external_metadata {
-		let origin = T::ExternalOrigin::try_successful_origin()
-			.expect("ExternalOrigin has no successful origin required for the benchmark");
-		assert_ok!(
-			Democracy::<T>::external_propose(origin.clone(), make_proposal::<T>(0))
-		);
-		let owner = MetadataOwner::External;
-		let hash = note_preimage::<T>();
-	}: set_metadata<T::RuntimeOrigin>(origin, owner.clone(), Some(hash))
-	verify {
-		assert_last_event::<T>(crate::Event::MetadataSet {
-			owner,
-			hash,
-		}.into());
-	}
-
-	clear_external_metadata {
-		let origin = T::ExternalOrigin::try_successful_origin()
-			.expect("ExternalOrigin has no successful origin required for the benchmark");
-		assert_ok!(
-			Democracy::<T>::external_propose(origin.clone(), make_proposal::<T>(0))
-		);
-		let owner = MetadataOwner::External;
-		let proposer = funded_account::<T>("proposer", 0);
-		let hash = note_preimage::<T>();
-		assert_ok!(Democracy::<T>::set_metadata(origin.clone(), owner.clone(), Some(hash)));
-	}: set_metadata<T::RuntimeOrigin>(origin, owner.clone(), None)
-	verify {
-		assert_last_event::<T>(crate::Event::MetadataCleared {
-			owner,
-			hash,
-		}.into());
-	}
-
-	set_proposal_metadata {
-		// Place our proposal at the end to make sure it's worst case.
-		for i in 0 .. T::MaxProposals::get() {
-			add_proposal::<T>(i)?;
-		}
-		let owner = MetadataOwner::Proposal(0);
-		let proposer = funded_account::<T>("proposer", 0);
-		let hash = note_preimage::<T>();
-	}: set_metadata<T::RuntimeOrigin>(RawOrigin::Signed(proposer).into(), owner.clone(), Some(hash))
-	verify {
-		assert_last_event::<T>(crate::Event::MetadataSet {
-			owner,
-			hash,
-		}.into());
-	}
-
-	clear_proposal_metadata {
-		// Place our proposal at the end to make sure it's worst case.
-		for i in 0 .. T::MaxProposals::get() {
-			add_proposal::<T>(i)?;
-		}
-		let proposer = funded_account::<T>("proposer", 0);
-		let owner = MetadataOwner::Proposal(0);
-		let hash = note_preimage::<T>();
-		assert_ok!(Democracy::<T>::set_metadata(
-			RawOrigin::Signed(proposer.clone()).into(),
-			owner.clone(),
-			Some(hash)));
-	}: set_metadata<T::RuntimeOrigin>(RawOrigin::Signed(proposer).into(), owner.clone(), None)
-	verify {
-		assert_last_event::<T>(crate::Event::MetadataCleared {
-			owner,
-			hash,
-		}.into());
-	}
-
-	set_referendum_metadata {
-		// create not ongoing referendum.
-		ReferendumInfoOf::<T>::insert(
-			0,
-			ReferendumInfo::Finished { end: T::BlockNumber::zero(), approved: true },
-		);
-		let owner = MetadataOwner::Referendum(0);
-		let caller = funded_account::<T>("caller", 0);
-		let hash = note_preimage::<T>();
-	}: set_metadata<T::RuntimeOrigin>(RawOrigin::Root.into(), owner.clone(), Some(hash))
-	verify {
-		assert_last_event::<T>(crate::Event::MetadataSet {
-			owner,
-			hash,
-		}.into());
-	}
-
-	clear_referendum_metadata {
-		// create not ongoing referendum.
-		ReferendumInfoOf::<T>::insert(
-			0,
-			ReferendumInfo::Finished { end: T::BlockNumber::zero(), approved: true },
-		);
-		let owner = MetadataOwner::Referendum(0);
-		let hash = note_preimage::<T>();
-		MetadataOf::<T>::insert(owner.clone(), hash);
-		let caller = funded_account::<T>("caller", 0);
-	}: set_metadata<T::RuntimeOrigin>(RawOrigin::Signed(caller).into(), owner.clone(), None)
-	verify {
-		assert_last_event::<T>(crate::Event::MetadataCleared {
-			owner,
-			hash,
-		}.into());
-	}
-
 	impl_benchmark_test_suite!(
 		Democracy,
 		crate::tests::new_test_ext(),