Fix: benchmarking for pallet-data-preservers and pallet-registrar on Dancelight

.gitignore

@@ -11,6 +11,9 @@
 # Spec/Wasm build directory
 /build/
 
-
 # RustRover - related
-**/.idea
+**/.idea
+
+# Temporary files
+**/tmp
+raw.json

pallets/data-preservers/src/benchmarks.rs

@@ -36,6 +36,17 @@ use {
     tp_traits::{ParaId, StorageDeposit},
 };
 
+/// Trait describing factory function for para_id.
+pub trait ArgumentFactory<AcocuntId> {
+    /// Factory function reserving parachain
+    fn reserve_para_id(para_id: ParaId);
+}
+
+/// Dummy implementation for when the factory is not needed.
+impl<AccountId> ArgumentFactory<AccountId> for () {
+    fn reserve_para_id(_para_id: ParaId) {}
+}
+
 macro_rules! bset {
     ( $($value:expr),* $(,)? ) => {
         {
@@ -319,7 +330,11 @@ mod benchmarks {
     #[benchmark]
     fn start_assignment() {
         let url = BoundedVec::try_from(vec![b'A'; 10]).unwrap();
-        let para_id = ParaId::from(42);
+        // !!! (Applicable for Dancelight only)
+        // The specified ParaId needs to be larger than LOWEST_PUBLIC_ID value in Polkadot SDK.
+        // Currently, this value is 2000. We should also avoid setting the value to one of
+        // the container chains reserved by root
+        let para_id = ParaId::from(2042);
 
         let profile = Profile {
             url,
@@ -333,6 +348,8 @@ mod benchmarks {
         Pallet::<T>::create_profile(RawOrigin::Signed(caller.clone()).into(), profile)
             .expect("to create profile");
 
+        T::BenchmarkHelper::reserve_para_id(para_id);
+
         let origin = T::AssignmentOrigin::try_successful_origin(&para_id).unwrap();
 
         #[extrinsic_call]
@@ -352,7 +369,11 @@ mod benchmarks {
     #[benchmark]
     fn stop_assignment() {
         let url = BoundedVec::try_from(vec![b'A'; 10]).unwrap();
-        let para_id = ParaId::from(42);
+        // !!! (Applicable for Dancelight only)
+        // The specified ParaId needs to be larger than LOWEST_PUBLIC_ID value in Polkadot SDK.
+        // Currently, this value is 2000. We should also avoid setting the value to one of
+        // the container chains reserved by root
+        let para_id = ParaId::from(2042);
 
         let profile = Profile {
             url,
@@ -366,6 +387,8 @@ mod benchmarks {
         Pallet::<T>::create_profile(RawOrigin::Signed(caller.clone()).into(), profile)
             .expect("to create profile");
 
+        T::BenchmarkHelper::reserve_para_id(para_id);
+
         let origin = T::AssignmentOrigin::try_successful_origin(&para_id).unwrap();
 
         Pallet::<T>::start_assignment(

pallets/data-preservers/src/lib.rs

@@ -33,6 +33,9 @@ mod tests;
 #[cfg(any(test, feature = "runtime-benchmarks"))]
 mod benchmarks;
 
+#[cfg(feature = "runtime-benchmarks")]
+pub use benchmarks::ArgumentFactory;
+
 pub mod weights;
 pub use weights::WeightInfo;
 
@@ -172,6 +175,10 @@ pub mod pallet {
         type AssignmentPayment: AssignmentPayment<Self::AccountId>;
 
         type WeightInfo: WeightInfo;
+
+        /// Helper type for benchmarks.
+        #[cfg(feature = "runtime-benchmarks")]
+        type BenchmarkHelper: ArgumentFactory<Self::AccountId>;
     }
 
     #[pallet::event]

pallets/data-preservers/src/mock.rs

@@ -446,6 +446,9 @@ impl pallet_data_preservers::Config for Test {
     type MaxParaIdsVecLen = ConstU32<20>;
     type ProfileDeposit = tp_traits::BytesDeposit<ConstU128<1000>, ConstU128<51>>;
     type WeightInfo = ();
+
+    #[cfg(feature = "runtime-benchmarks")]
+    type BenchmarkHelper = ();
 }
 
 #[derive(Default)]

runtime/dancebox/src/lib.rs

@@ -1165,6 +1165,8 @@ impl pallet_data_preservers::Config for Runtime {
     type MaxAssignmentsPerParaId = MaxAssignmentsPerParaId;
     type MaxNodeUrlLen = MaxNodeUrlLen;
     type MaxParaIdsVecLen = MaxLengthParaIds;
+    #[cfg(feature = "runtime-benchmarks")]
+    type BenchmarkHelper = ();
 }
 
 impl pallet_author_noting::Config for Runtime {

runtime/flashbox/src/lib.rs

@@ -1013,6 +1013,9 @@ impl pallet_data_preservers::Config for Runtime {
     type MaxAssignmentsPerParaId = MaxAssignmentsPerParaId;
     type MaxNodeUrlLen = MaxNodeUrlLen;
     type MaxParaIdsVecLen = MaxLengthParaIds;
+
+    #[cfg(feature = "runtime-benchmarks")]
+    type BenchmarkHelper = ();
 }
 
 impl pallet_author_noting::Config for Runtime {

solo-chains/runtime/dancelight/src/lib.rs

@@ -1317,6 +1317,8 @@ impl pallet_beefy_mmr::Config for Runtime {
 
 impl paras_sudo_wrapper::Config for Runtime {}
 
+#[cfg(feature = "runtime-benchmarks")]
+use pallet_data_preservers::ArgumentFactory;
 use pallet_pooled_staking::traits::{IsCandidateEligible, Timer};
 use pallet_staking::SessionInterface;
 
@@ -1558,7 +1560,7 @@ impl pallet_data_preservers::AssignmentPayment<AccountId> for PreserversAssignme
     type ProviderRequest = PreserversAssignmentPaymentRequest;
     /// Extra parameter the assigner provides.
     type AssignerParameter = PreserversAssignmentPaymentExtra;
-    /// Represents the succesful outcome of the assignment.
+    /// Represents the successful outcome of the assignment.
     type AssignmentWitness = PreserversAssignmentPaymentWitness;
 
     fn try_start_assignment(
@@ -1618,11 +1620,54 @@ impl pallet_data_preservers::AssignmentPayment<AccountId> for PreserversAssignme
     }
 }
 
+pub struct DataPreserversBenchmarkHelper<T>(PhantomData<T>);
+
+#[cfg(feature = "runtime-benchmarks")]
+impl<T> ArgumentFactory<T::AccountId> for DataPreserversBenchmarkHelper<T>
+where
+    T: pallet_registrar::Config + pallet_balances::Config + paras_registrar::Config,
+{
+    fn reserve_para_id(para_id: ParaId) {
+        use frame_support::{assert_ok, dispatch::RawOrigin, traits::fungible::Mutate};
+
+        let account: T::AccountId = frame_benchmarking::account("para_manager", 0, 1);
+        assert_ok!(<T as pallet_registrar::Config>::Currency::mint_into(
+            &account,
+            <T as pallet_registrar::Config>::Currency::minimum_balance() * 10_000_000u32.into()
+                + T::DepositAmount::get(),
+        ));
+
+        paras_registrar::NextFreeParaId::<T>::put(para_id);
+        assert_eq!(paras_registrar::NextFreeParaId::<T>::get(), para_id);
+        assert_ok!(paras_registrar::Pallet::<T>::reserve(
+            RawOrigin::Signed(account.clone()).into()
+        ));
+
+        let mut storage = vec![];
+        storage.push((b":code".to_vec(), vec![1; 10]).into());
+        let genesis_data = ContainerChainGenesisData {
+            storage,
+            name: Default::default(),
+            id: Default::default(),
+            fork_id: Default::default(),
+            extensions: Default::default(),
+            properties: Default::default(),
+        };
+
+        assert_ok!(pallet_registrar::Pallet::<T>::register(
+            RawOrigin::Signed(account).into(),
+            para_id,
+            genesis_data,
+            T::InnerRegistrar::bench_head_data()
+        ));
+    }
+}
+
 impl pallet_data_preservers::Config for Runtime {
     type RuntimeEvent = RuntimeEvent;
     type RuntimeHoldReason = RuntimeHoldReason;
     type Currency = Balances;
-    type WeightInfo = ();
+    type WeightInfo = weights::pallet_data_preservers::SubstrateWeight<Runtime>;
 
     type ProfileId = u64;
     type ProfileDeposit = tp_traits::BytesDeposit<ProfileDepositBaseFee, ProfileDepositByteFee>;
@@ -1634,6 +1679,8 @@ impl pallet_data_preservers::Config for Runtime {
     type MaxAssignmentsPerParaId = MaxAssignmentsPerParaId;
     type MaxNodeUrlLen = MaxNodeUrlLen;
     type MaxParaIdsVecLen = MaxLengthParaIds;
+    #[cfg(feature = "runtime-benchmarks")]
+    type BenchmarkHelper = DataPreserversBenchmarkHelper<Runtime>;
 }
 
 parameter_types! {
@@ -2053,8 +2100,13 @@ impl pallet_registrar::Config for Runtime {
     type DepositAmount = DepositAmount;
     type RegistrarHooks = DancelightRegistrarHooks;
     type RuntimeHoldReason = RuntimeHoldReason;
-    type InnerRegistrar =
-        InnerDancelightRegistrar<Runtime, AccountId, Registrar, paras_registrar::TestWeightInfo>;
+
+    type InnerRegistrar = InnerDancelightRegistrar<
+        Runtime,
+        AccountId,
+        Registrar,
+        weights::runtime_common_paras_registrar::SubstrateWeight<Runtime>,
+    >;
     type WeightInfo = weights::pallet_registrar::SubstrateWeight<Runtime>;
 }
 
@@ -2206,7 +2258,9 @@ mod benches {
         [pallet_external_validators_rewards, ExternalValidatorsRewards]
         [pallet_external_validator_slashes, ExternalValidatorSlashes]
         [pallet_invulnerables, TanssiInvulnerables]
+        [pallet_data_preservers, DataPreservers]
         [pallet_pooled_staking, PooledStaking]
+
         // XCM
         [pallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
         [pallet_xcm_benchmarks::fungible, pallet_xcm_benchmarks::fungible::Pallet::<Runtime>]

solo-chains/runtime/dancelight/src/weights/mod.rs

@@ -20,6 +20,7 @@ pub mod pallet_author_noting;
 pub mod pallet_balances;
 pub mod pallet_collator_assignment;
 pub mod pallet_conviction_voting;
+pub mod pallet_data_preservers;
 pub mod pallet_external_validator_slashes;
 pub mod pallet_external_validators;
 pub mod pallet_external_validators_rewards;