Add pallet-collective instances benchmarks to all runtimes

.github/workflows/check-benchmarks.yml

@@ -5,6 +5,9 @@ on:
   schedule:
     - cron: "0 5 * * 0" # Runs every Sunday at 5:00 AM UTC
     - cron: "0 5 * * 3" # Runs every Wednesday at 5:00 AM UTC
+
+env:
+  FRAME_OMNI_BENCHER_RELEASE_VERSION: polkadot-stable2412
 
 jobs:
   set-tags:
@@ -59,6 +62,12 @@ jobs:
           rustup override unset
           rustup show
           rustup target add wasm32-unknown-unknown
+      - name: Install frame-omni-bencher
+        shell: bash
+        run: |
+          curl -sL https://github.com/paritytech/polkadot-sdk/releases/download/$FRAME_OMNI_BENCHER_RELEASE_VERSION/frame-omni-bencher -o frame-omni-bencher
+          chmod +x ./frame-omni-bencher
+          ./frame-omni-bencher --version
       - name: Run benchmarks
         shell: bash
         run: |

runtime/moonbase/src/governance/councils.rs

@@ -39,7 +39,7 @@ impl pallet_collective::Config<TreasuryCouncilInstance> for Runtime {
 	/// The maximum number of treasury council members.
 	type MaxMembers = ConstU32<9>;
 	type DefaultVote = pallet_collective::MoreThanMajorityThenPrimeDefaultVote;
-	type WeightInfo = moonbase_weights::pallet_collective::WeightInfo<Runtime>;
+	type WeightInfo = moonbase_weights::pallet_collective_treasury_council::WeightInfo<Runtime>;
 	type SetMembersOrigin = referenda::GeneralAdminOrRoot;
 	type MaxProposalWeight = MaxProposalWeight;
 }
@@ -56,7 +56,7 @@ impl pallet_collective::Config<OpenTechCommitteeInstance> for Runtime {
 	/// The maximum number of technical committee members.
 	type MaxMembers = ConstU32<100>;
 	type DefaultVote = pallet_collective::MoreThanMajorityThenPrimeDefaultVote;
-	type WeightInfo = moonbase_weights::pallet_collective::WeightInfo<Runtime>;
+	type WeightInfo = moonbase_weights::pallet_collective_open_tech_committee::WeightInfo<Runtime>;
 	type SetMembersOrigin = referenda::GeneralAdminOrRoot;
 	type MaxProposalWeight = MaxProposalWeight;
 }

runtime/moonbase/src/lib.rs

@@ -1462,6 +1462,12 @@ use moonbeam_runtime_common::deal_with_fees::{
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benches {
+	// TODO: Temporary workaround before upgrading to latest polkadot-sdk - fix https://github.com/paritytech/polkadot-sdk/pull/6435
+	#[allow(unused_imports)]
+	use pallet_collective as pallet_collective_treasury_council;
+	#[allow(unused_imports)]
+	use pallet_collective as pallet_collective_open_tech_committee;
+
 	frame_support::parameter_types! {
 		pub const MaxBalance: crate::Balance = crate::Balance::max_value();
 	}
@@ -1501,6 +1507,8 @@ mod benches {
 		[pallet_precompile_benchmarks, PrecompileBenchmarks]
 		[pallet_parameters, Parameters]
 		[pallet_xcm_weight_trader, XcmWeightTrader]
+		[pallet_collective_treasury_council, TreasuryCouncilCollective]
+		[pallet_collective_open_tech_committee, OpenTechCommitteeCollective]
 	);
 }
 

runtime/moonbase/src/weights/mod.rs

@@ -25,7 +25,8 @@ pub mod pallet_author_inherent;
 pub mod pallet_author_mapping;
 pub mod pallet_author_slot_filter;
 pub mod pallet_balances;
-pub mod pallet_collective;
+pub mod pallet_collective_open_tech_committee;
+pub mod pallet_collective_treasury_council;
 pub mod pallet_conviction_voting;
 pub mod pallet_crowdloan_rewards;
 pub mod pallet_evm;

runtime/moonbeam/src/governance/councils.rs

@@ -38,7 +38,7 @@ impl pallet_collective::Config<TreasuryCouncilInstance> for Runtime {
 	/// The maximum number of treasury council members.
 	type MaxMembers = ConstU32<9>;
 	type DefaultVote = pallet_collective::MoreThanMajorityThenPrimeDefaultVote;
-	type WeightInfo = moonbeam_weights::pallet_collective::WeightInfo<Runtime>;
+	type WeightInfo = moonbeam_weights::pallet_collective_treasury_council::WeightInfo<Runtime>;
 	type SetMembersOrigin = referenda::GeneralAdminOrRoot;
 	type MaxProposalWeight = MaxProposalWeight;
 }
@@ -55,7 +55,7 @@ impl pallet_collective::Config<OpenTechCommitteeInstance> for Runtime {
 	/// The maximum number of technical committee members.
 	type MaxMembers = ConstU32<100>;
 	type DefaultVote = pallet_collective::MoreThanMajorityThenPrimeDefaultVote;
-	type WeightInfo = moonbeam_weights::pallet_collective::WeightInfo<Runtime>;
+	type WeightInfo = moonbeam_weights::pallet_collective_open_tech_committee::WeightInfo<Runtime>;
 	type SetMembersOrigin = referenda::GeneralAdminOrRoot;
 	type MaxProposalWeight = MaxProposalWeight;
 }

runtime/moonbeam/src/lib.rs

@@ -1457,6 +1457,12 @@ use moonbeam_runtime_common::deal_with_fees::{
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benches {
+	// TODO: Temporary workaround before upgrading to latest polkadot-sdk - fix https://github.com/paritytech/polkadot-sdk/pull/6435
+	#[allow(unused_imports)]
+	use pallet_collective as pallet_collective_treasury_council;
+	#[allow(unused_imports)]
+	use pallet_collective as pallet_collective_open_tech_committee;
+
 	frame_support::parameter_types! {
 		pub const MaxBalance: crate::Balance = crate::Balance::max_value();
 	}
@@ -1495,6 +1501,8 @@ mod benches {
 		[pallet_precompile_benchmarks, PrecompileBenchmarks]
 		[pallet_parameters, Parameters]
 		[pallet_xcm_weight_trader, XcmWeightTrader]
+		[pallet_collective_treasury_council, TreasuryCouncilCollective]
+		[pallet_collective_open_tech_committee, OpenTechCommitteeCollective]
 	);
 }
 

runtime/moonbeam/src/weights/mod.rs

@@ -25,7 +25,8 @@ pub mod pallet_author_inherent;
 pub mod pallet_author_mapping;
 pub mod pallet_author_slot_filter;
 pub mod pallet_balances;
-pub mod pallet_collective;
+pub mod pallet_collective_open_tech_committee;
+pub mod pallet_collective_treasury_council;
 pub mod pallet_conviction_voting;
 pub mod pallet_crowdloan_rewards;
 pub mod pallet_evm;