fix: schemas pallet benchmarks/weights

Author: JoeCap08055

pallets/schemas/src/benchmarking.rs

@@ -37,7 +37,7 @@ mod benchmarks {
 	use super::*;
 
 	#[benchmark]
-	fn create_schema_v3(
+	fn create_schema_v3_with_name(
 		m: Linear<
 			{ T::MinSchemaModelSizeBytes::get() + 8 },
 			{ T::SchemaModelMaxBytesBoundedVecLimit::get() - 1 },
@@ -61,7 +61,7 @@ mod benchmarks {
 		let schema_input = generate_schema::<T>(m as usize);
 
 		#[extrinsic_call]
-		_(
+		create_schema_v3(
 			RawOrigin::Signed(sender),
 			schema_input,
 			model_type,
@@ -78,6 +78,40 @@ mod benchmarks {
 		Ok(())
 	}
 
+	#[benchmark]
+	fn create_schema_v3_without_name(
+		m: Linear<
+			{ T::MinSchemaModelSizeBytes::get() + 8 },
+			{ T::SchemaModelMaxBytesBoundedVecLimit::get() - 1 },
+		>,
+	) -> Result<(), BenchmarkError> {
+		let sender: T::AccountId = whitelisted_caller();
+		let model_type = ModelType::AvroBinary;
+		let payload_location = PayloadLocation::OnChain;
+		assert_ok!(SchemasPallet::<T>::set_max_schema_model_bytes(
+			RawOrigin::Root.into(),
+			T::SchemaModelMaxBytesBoundedVecLimit::get()
+		));
+		let schema_input = generate_schema::<T>(m as usize);
+
+		#[extrinsic_call]
+		create_schema_v3(
+			RawOrigin::Signed(sender),
+			schema_input,
+			model_type,
+			payload_location,
+			BoundedVec::default(),
+			None,
+		);
+
+		ensure!(
+			CurrentSchemaIdentifierMaximum::<T>::get() > 0,
+			"Created schema count should be > 0"
+		);
+		ensure!(SchemaInfos::<T>::get(1).is_some(), "Created schema should exist");
+		Ok(())
+	}
+
 	#[benchmark]
 	fn set_max_schema_model_bytes() -> Result<(), BenchmarkError> {
 		let sender = RawOrigin::Root;
@@ -95,7 +129,7 @@ mod benchmarks {
 	}
 
 	#[benchmark]
-	fn create_schema_via_governance_v2(
+	fn create_schema_via_governance_v2_with_name(
 		m: Linear<
 			{ T::MinSchemaModelSizeBytes::get() + 8 },
 			{ T::SchemaModelMaxBytesBoundedVecLimit::get() - 1 },
@@ -119,7 +153,7 @@ mod benchmarks {
 		let schema_input = generate_schema::<T>(m as usize);
 
 		#[extrinsic_call]
-		_(
+		create_schema_via_governance_v2(
 			RawOrigin::Root,
 			sender.clone(),
 			schema_input,
@@ -138,7 +172,42 @@ mod benchmarks {
 	}
 
 	#[benchmark]
-	fn propose_to_create_schema_v2(
+	fn create_schema_via_governance_v2_without_name(
+		m: Linear<
+			{ T::MinSchemaModelSizeBytes::get() + 8 },
+			{ T::SchemaModelMaxBytesBoundedVecLimit::get() - 1 },
+		>,
+	) -> Result<(), BenchmarkError> {
+		let sender: T::AccountId = whitelisted_caller();
+		let model_type = ModelType::AvroBinary;
+		let payload_location = PayloadLocation::OnChain;
+		assert_ok!(SchemasPallet::<T>::set_max_schema_model_bytes(
+			RawOrigin::Root.into(),
+			T::SchemaModelMaxBytesBoundedVecLimit::get()
+		));
+		let schema_input = generate_schema::<T>(m as usize);
+
+		#[extrinsic_call]
+		create_schema_via_governance_v2(
+			RawOrigin::Root,
+			sender.clone(),
+			schema_input,
+			model_type,
+			payload_location,
+			BoundedVec::default(),
+			None,
+		);
+
+		ensure!(
+			CurrentSchemaIdentifierMaximum::<T>::get() > 0,
+			"Created schema count should be > 0"
+		);
+		ensure!(SchemaInfos::<T>::get(1).is_some(), "Created schema should exist");
+		Ok(())
+	}
+
+	#[benchmark]
+	fn propose_to_create_schema_v2_with_name(
 		m: Linear<
 			{ T::MinSchemaModelSizeBytes::get() + 8 },
 			{ T::SchemaModelMaxBytesBoundedVecLimit::get() - 1 },
@@ -162,7 +231,7 @@ mod benchmarks {
 		let schema_input = generate_schema::<T>(m as usize);
 
 		#[extrinsic_call]
-		_(
+		propose_to_create_schema_v2(
 			RawOrigin::Signed(sender),
 			schema_input,
 			model_type,
@@ -175,6 +244,36 @@ mod benchmarks {
 		Ok(())
 	}
 
+	#[benchmark]
+	fn propose_to_create_schema_v2_without_name(
+		m: Linear<
+			{ T::MinSchemaModelSizeBytes::get() + 8 },
+			{ T::SchemaModelMaxBytesBoundedVecLimit::get() - 1 },
+		>,
+	) -> Result<(), BenchmarkError> {
+		let sender: T::AccountId = whitelisted_caller();
+		let model_type = ModelType::AvroBinary;
+		let payload_location = PayloadLocation::OnChain;
+		assert_ok!(SchemasPallet::<T>::set_max_schema_model_bytes(
+			RawOrigin::Root.into(),
+			T::SchemaModelMaxBytesBoundedVecLimit::get()
+		));
+		let schema_input = generate_schema::<T>(m as usize);
+
+		#[extrinsic_call]
+		propose_to_create_schema_v2(
+			RawOrigin::Signed(sender),
+			schema_input,
+			model_type,
+			payload_location,
+			BoundedVec::default(),
+			None,
+		);
+
+		assert_eq!(T::ProposalProvider::proposal_count(), 1);
+		Ok(())
+	}
+
 	#[benchmark]
 	fn propose_to_create_schema_name() -> Result<(), BenchmarkError> {
 		let sender: T::AccountId = whitelisted_caller();

pallets/schemas/src/lib.rs

@@ -333,8 +333,8 @@ pub mod pallet {
 		#[pallet::call_index(5)]
 		#[pallet::weight(
 			match schema_name {
-				Some(_) => T::WeightInfo::propose_to_create_schema_v2(model.len() as u32),
-				None => T::WeightInfo::propose_to_create_schema(model.len() as u32)
+				Some(_) => T::WeightInfo::propose_to_create_schema_v2_with_name(model.len() as u32),
+				None => T::WeightInfo::propose_to_create_schema_v2_without_name(model.len() as u32)
 			}
 		)]
 		pub fn propose_to_create_schema_v2(
@@ -384,8 +384,8 @@ pub mod pallet {
 		#[pallet::call_index(6)]
 		#[pallet::weight(
 			match schema_name {
-				Some(_) => T::WeightInfo::create_schema_via_governance_v2(model.len() as u32+ settings.len() as u32),
-				None => T::WeightInfo::create_schema_via_governance(model.len() as u32+ settings.len() as u32)
+				Some(_) => T::WeightInfo::create_schema_via_governance_v2_with_name(model.len() as u32+ settings.len() as u32),
+				None => T::WeightInfo::create_schema_via_governance_v2_without_name(model.len() as u32+ settings.len() as u32)
 			}
 		)]
 		pub fn create_schema_via_governance_v2(
@@ -443,8 +443,8 @@ pub mod pallet {
 		#[pallet::call_index(7)]
 		#[pallet::weight(
 			match schema_name {
-				Some(_) => T::WeightInfo::create_schema_v3(model.len() as u32 + settings.len() as u32),
-				None => T::WeightInfo::create_schema_v2(model.len() as u32 + settings.len() as u32)
+				Some(_) => T::WeightInfo::create_schema_v3_with_name(model.len() as u32 + settings.len() as u32),
+				None => T::WeightInfo::create_schema_v3_without_name(model.len() as u32 + settings.len() as u32)
 			}
 		)]
 		pub fn create_schema_v3(