fix

frame/collective/src/benchmarking.rs

@@ -34,8 +34,25 @@ fn assert_last_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::
 	frame_system::Pallet::<T>::assert_last_event(generic_event.into());
 }
 
-fn id_to_remark_data<T: Config<I>, I: 'static>(id: u32, length: usize) -> SystemCall<T> {
-	SystemCall::<T>::remark { remark: vec![id.try_into().unwrap(); length] }
+fn id_to_remark_data<T: Config<I>, I: 'static>(id: u32, length: usize) -> Vec<u8> {
+	let mut data: Vec<u8> = vec![];
+	let mut value = id.clone();
+	let mut value_size = 0;
+
+	while value > 255 {
+		value -= 255;
+		value_size += 1;
+	}
+
+	for i in 0..length {
+		if i == value_size {
+			// this should never panic.
+			data.push(value.try_into().unwrap());
+			continue
+		}
+		data.push(value_size.try_into().unwrap());
+	}
+	data
 }
 
 benchmarks_instance_pallet! {
@@ -68,7 +85,7 @@ benchmarks_instance_pallet! {
 			let length = 100;
 			for i in 0 .. p {
 				// Proposals should be different so that different proposal hashes are generated
-				let proposal: T::Proposal = id_to_remark_data(i, length).into();
+				let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data::<T, I>(i, length) }.into();
 				Collective::<T, I>::propose(
 					SystemOrigin::Signed(old_members.last().unwrap().clone()).into(),
 					threshold,
@@ -107,7 +124,7 @@ benchmarks_instance_pallet! {
 	}
 
 	execute {
-		let b in 1 .. MAX_BYTES;
+		let b in 10 .. MAX_BYTES;
 		let m in 1 .. T::MaxMembers::get();
 
 		let bytes_in_storage = 4 * (b + size_of::<u32>() as u32);
@@ -124,7 +141,7 @@ benchmarks_instance_pallet! {
 
 		Collective::<T, I>::set_members(SystemOrigin::Root.into(), members, None, T::MaxMembers::get())?;
 
-		let proposal: T::Proposal = SystemCall::<T>::remark_vec_u32 { remark: vec![1; b as usize] }.into();
+		let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data::<T, I>(1, b as usize) }.into();
 
 	}: _(SystemOrigin::Signed(caller), Box::new(proposal.clone()), bytes_in_storage)
 	verify {
@@ -137,7 +154,7 @@ benchmarks_instance_pallet! {
 
 	// This tests when execution would happen immediately after proposal
 	propose_execute {
-		let b in 1 .. MAX_BYTES;
+		let b in 10 .. MAX_BYTES;
 		let m in 1 .. T::MaxMembers::get();
 
 		let bytes_in_storage = 4 * (b + size_of::<u32>() as u32);
@@ -154,7 +171,7 @@ benchmarks_instance_pallet! {
 
 		Collective::<T, I>::set_members(SystemOrigin::Root.into(), members, None, T::MaxMembers::get())?;
 
-		let proposal: T::Proposal = SystemCall::<T>::remark_vec_u32 { remark: vec![1; b as usize] }.into();
+		let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data::<T, I>(1, b as usize) }.into();
 		let threshold = 1;
 
 	}: propose(SystemOrigin::Signed(caller), threshold, Box::new(proposal.clone()), bytes_in_storage)
@@ -168,7 +185,7 @@ benchmarks_instance_pallet! {
 
 	// This tests when proposal is created and queued as "proposed"
 	propose_proposed {
-		let b in 1 .. MAX_BYTES;
+		let b in 10 .. MAX_BYTES;
 		let m in 2 .. T::MaxMembers::get();
 		let p in 1 .. T::MaxProposals::get();
 
@@ -188,7 +205,7 @@ benchmarks_instance_pallet! {
 		// Add previous proposals.
 		for i in 0 .. p - 1 {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = id_to_remark_data(i, b as usize).into();
+			let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data::<T, I>(i, b as usize) }.into();
 			Collective::<T, I>::propose(
 				SystemOrigin::Signed(caller.clone()).into(),
 				threshold,
@@ -199,7 +216,7 @@ benchmarks_instance_pallet! {
 
 		assert_eq!(Collective::<T, I>::proposals().len(), (p - 1) as usize);
 
-		let proposal: T::Proposal = SystemCall::<T>::remark_vec_u32 { remark: vec![p; b as usize] }.into();
+		let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data::<T, I>(p, b as usize) }.into();
 
 	}: propose(SystemOrigin::Signed(caller.clone()), threshold, Box::new(proposal.clone()), bytes_in_storage)
 	verify {
@@ -236,7 +253,7 @@ benchmarks_instance_pallet! {
 		let mut last_hash = T::Hash::default();
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = id_to_remark_data(i, b as usize).into();
+			let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data::<T, I>(i, b as usize) }.into();
 			Collective::<T, I>::propose(
 				SystemOrigin::Signed(proposer.clone()).into(),
 				threshold,
@@ -311,9 +328,7 @@ benchmarks_instance_pallet! {
 		let mut last_hash = T::Hash::default();
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = SystemCall::<T>::remark_vec_u32 {
-				remark: vec![i; bytes as usize]
-			}.into();
+			let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data::<T, I>(i, bytes as usize) }.into();
 			Collective::<T, I>::propose(
 				SystemOrigin::Signed(proposer.clone()).into(),
 				threshold,
@@ -366,7 +381,7 @@ benchmarks_instance_pallet! {
 	}
 
 	close_early_approved {
-		let b in 1 .. MAX_BYTES;
+		let b in 10 .. MAX_BYTES;
 		// We choose 4 as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
 		let m in 4 .. T::MaxMembers::get();
 		let p in 1 .. T::MaxProposals::get();
@@ -390,7 +405,7 @@ benchmarks_instance_pallet! {
 		let mut last_hash = T::Hash::default();
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = id_to_remark_data(i, b as usize).into();
+			let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data::<T, I>(i, b as usize) }.into();
 			Collective::<T, I>::propose(
 				SystemOrigin::Signed(caller.clone()).into(),
 				threshold,
@@ -476,9 +491,7 @@ benchmarks_instance_pallet! {
 		let mut last_hash = T::Hash::default();
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = SystemCall::<T>::remark_vec_u32 {
-				remark: vec![i; bytes as usize]
-			}.into();
+			let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data::<T, I>(i, bytes as usize) }.into();
 			Collective::<T, I>::propose(
 				SystemOrigin::Signed(caller.clone()).into(),
 				threshold,
@@ -521,7 +534,7 @@ benchmarks_instance_pallet! {
 	}
 
 	close_approved {
-		let b in 1 .. MAX_BYTES;
+		let b in 10 .. MAX_BYTES;
 		// We choose 4 as a minimum so we always trigger a vote in the voting loop (`for j in ...`)
 		let m in 4 .. T::MaxMembers::get();
 		let p in 1 .. T::MaxProposals::get();
@@ -550,7 +563,7 @@ benchmarks_instance_pallet! {
 		let mut last_hash = T::Hash::default();
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = id_to_remark_data(i, b as usize).into();
+			let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data::<T, I>(i, b as usize) }.into();
 			Collective::<T, I>::propose(
 				SystemOrigin::Signed(caller.clone()).into(),
 				threshold,
@@ -621,7 +634,7 @@ benchmarks_instance_pallet! {
 		let mut last_hash = T::Hash::default();
 		for i in 0 .. p {
 			// Proposals should be different so that different proposal hashes are generated
-			let proposal: T::Proposal = id_to_remark_data(i, b as usize).into();
+			let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data::<T, I>(i, b as usize) }.into();
 			Collective::<T, I>::propose(
 				SystemOrigin::Signed(caller.clone()).into(),
 				threshold,

frame/collective/src/tests.rs

@@ -89,7 +89,7 @@ pub type MaxMembers = ConstU32<100>;
 
 parameter_types! {
 	pub const MotionDuration: u64 = 3;
-	pub const MaxProposals: u32 = 100;
+	pub const MaxProposals: u32 = 512;
 	pub BlockWeights: frame_system::limits::BlockWeights =
 		frame_system::limits::BlockWeights::simple_max(frame_support::weights::Weight::from_ref_time(1024));
 }

frame/system/src/lib.rs

@@ -398,15 +398,6 @@ pub mod pallet {
 			Ok(().into())
 		}
 
-		#[pallet::weight(T::SystemWeightInfo::remark(_remark.len() as u32))]
-		pub fn remark_vec_u32(
-			origin: OriginFor<T>,
-			_remark: Vec<u32>,
-		) -> DispatchResultWithPostInfo {
-			ensure_signed_or_root(origin)?;
-			Ok(().into())
-		}
-
 		/// Set the number of pages in the WebAssembly environment's heap.
 		#[pallet::weight((T::SystemWeightInfo::set_heap_pages(), DispatchClass::Operational))]
 		pub fn set_heap_pages(origin: OriginFor<T>, pages: u64) -> DispatchResultWithPostInfo {