Fixes

bin/node/runtime/src/weights/pallet_democracy.rs

@@ -83,8 +83,9 @@ impl pallet_democracy::WeightInfo for WeightInfo {
 			.saturating_add(DbWeight::get().reads(2 as Weight))
 			.saturating_add(DbWeight::get().writes(2 as Weight))
 	}
-	fn cancel_proposal() -> Weight {
+	fn cancel_proposal(p: u32, ) -> Weight {
 		(64238000 as Weight)
+			.saturating_add((694000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(DbWeight::get().reads(3 as Weight))
 			.saturating_add(DbWeight::get().writes(3 as Weight))
 	}

frame/democracy/src/benchmarking.rs

@@ -322,7 +322,12 @@ benchmarks! {
 	}
 
 	cancel_proposal {
-		let proposal_index = add_proposal::<T>(0)?;
+		let p in 1 .. T::MaxProposals::get();
+
+		// Place our proposal at the end to make sure it's worst case.
+		for i in 0 .. p {
+			add_proposal::<T>(i)?;
+		}
 	}: _(RawOrigin::Root, 0)
 
 	cancel_referendum {

frame/democracy/src/default_weight.rs

@@ -84,8 +84,9 @@ impl crate::WeightInfo for () {
 			.saturating_add(DbWeight::get().reads(2 as Weight))
 			.saturating_add(DbWeight::get().writes(2 as Weight))
 	}
-	fn cancel_proposal() -> Weight {
+	fn cancel_proposal(p: u32, ) -> Weight {
 		(64238000 as Weight)
+			.saturating_add((694000 as Weight).saturating_mul(p as Weight))
 			.saturating_add(DbWeight::get().reads(3 as Weight))
 			.saturating_add(DbWeight::get().writes(3 as Weight))
 	}

frame/democracy/src/lib.rs

@@ -215,7 +215,7 @@ pub trait WeightInfo {
 	fn fast_track() -> Weight;
 	fn veto_external(v: u32, ) -> Weight;
 	fn cancel_referendum() -> Weight;
-	fn cancel_proposal() -> Weight;
+	fn cancel_proposal(p: u32, ) -> Weight;
 	fn cancel_queued(r: u32, ) -> Weight;
 	fn on_initialize_base(r: u32, ) -> Weight;
 	fn delegate(r: u32, ) -> Weight;
@@ -1184,7 +1184,7 @@ decl_module! {
 		/// - `prop_index`: The index of the proposal to cancel.
 		///
 		/// Weight: `O(p)` where `p = PublicProps::<T>::decode_len()`
-		#[weight = T::WeightInfo::cancel_proposal()]
+		#[weight = T::WeightInfo::cancel_proposal(T::MaxProposals::get())]
 		fn cancel_proposal(origin, #[compact] prop_index: PropIndex) {
 			T::CancelProposalOrigin::ensure_origin(origin)?;