feat(mainnet): include all benchmarks

pallets/motion/src/benchmarking.rs

@@ -19,36 +19,42 @@ mod benchmarks {
 	use super::*;
 
 	#[benchmark]
-	fn simple_majority() {
+	fn simple_majority() -> Result<(), BenchmarkError> {
 		let call: <T as Config>::RuntimeCall = frame_system::Call::remark { remark: vec![] }.into();
-		let origin = <T as Config>::SimpleMajorityOrigin::try_successful_origin().unwrap();
+		let origin = <T as Config>::SimpleMajorityOrigin::try_successful_origin()
+			.map_err(|_| BenchmarkError::Weightless)?;
 
 		#[extrinsic_call]
 		_(origin as T::RuntimeOrigin, Box::new(call));
 
-		assert_last_event::<T>(Event::DispatchSimpleMajority { motion_result: Ok(()) }.into())
+		assert_last_event::<T>(Event::DispatchSimpleMajority { motion_result: Ok(()) }.into());
+		Ok(())
 	}
 
 	#[benchmark]
-	fn super_majority() {
+	fn super_majority() -> Result<(), BenchmarkError> {
 		let call: <T as Config>::RuntimeCall = frame_system::Call::remark { remark: vec![] }.into();
-		let origin = <T as Config>::SuperMajorityOrigin::try_successful_origin().unwrap();
+		let origin = <T as Config>::SuperMajorityOrigin::try_successful_origin()
+			.map_err(|_| BenchmarkError::Weightless)?;
 
 		#[extrinsic_call]
 		_(origin as T::RuntimeOrigin, Box::new(call));
 
-		assert_last_event::<T>(Event::DispatchSuperMajority { motion_result: Ok(()) }.into())
+		assert_last_event::<T>(Event::DispatchSuperMajority { motion_result: Ok(()) }.into());
+		Ok(())
 	}
 
 	#[benchmark]
-	fn unanimous() {
+	fn unanimous() -> Result<(), BenchmarkError> {
 		let call: <T as Config>::RuntimeCall = frame_system::Call::remark { remark: vec![] }.into();
-		let origin = <T as Config>::UnanimousOrigin::try_successful_origin().unwrap();
+		let origin = <T as Config>::UnanimousOrigin::try_successful_origin()
+			.map_err(|_| BenchmarkError::Weightless)?;
 
 		#[extrinsic_call]
 		_(origin as T::RuntimeOrigin, Box::new(call));
 
-		assert_last_event::<T>(Event::DispatchUnanimous { motion_result: Ok(()) }.into())
+		assert_last_event::<T>(Event::DispatchUnanimous { motion_result: Ok(()) }.into());
+		Ok(())
 	}
 
 	impl_benchmark_test_suite!(Motion, crate::mock::new_test_ext(), crate::mock::Test);

runtime/mainnet/src/apis.rs

@@ -265,6 +265,7 @@
 			use frame_benchmarking::{Benchmarking, BenchmarkList};
 			use frame_support::traits::StorageInfoTrait;
 			use frame_system_benchmarking::Pallet as SystemBench;
+			use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench;
 			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
 			use super::*;
 
@@ -282,8 +283,10 @@
 			use super::*;
 
 			use frame_system_benchmarking::Pallet as SystemBench;
+			use frame_system_benchmarking::extensions::Pallet as SystemExtensionsBench;
+
 
 			impl frame_system_benchmarking::Config for Runtime {
 				fn setup_set_code_requirements(code: &Vec<u8>) -> Result<(), BenchmarkError> {
 					ParachainSystem::initialize_for_set_code_benchmark(code.len() as u32);
 					Ok(())
@@ -295,7 +298,7 @@
 			}
 
 			use cumulus_pallet_session_benchmarking::Pallet as SessionBench;
 			impl cumulus_pallet_session_benchmarking::Config for Runtime {}
 
 			use frame_support::traits::WhitelistedStorageKeys;
 			let whitelist = AllPalletsWithSystem::whitelisted_storage_keys();

runtime/mainnet/src/benchmarks.rs

@@ -0,0 +1,44 @@
+use crate::{config::assets::TrustBackedAssetsInstance, Runtime};
+
+/// Instance of `pallet_assets` used for benchmarks of trust backed assets.
+pub type TrustBackedAssets = pallet_assets::Pallet<Runtime, TrustBackedAssetsInstance>;
+
+frame_benchmarking::define_benchmarks!(
+	// Ordered as per runtime
+	// System
+	[frame_system, SystemBench::<Runtime>]
+	[frame_system_extensions, SystemExtensionsBench::<Runtime>]
+	[cumulus_pallet_parachain_system, ParachainSystem]
+	[pallet_timestamp, Timestamp]
+	// Monetary
+	[pallet_balances, Balances]
+	[pallet_transaction_payment, TransactionPayment]
+	[pallet_treasury, Treasury]
+	// Governance
+	[pallet_sudo, Sudo]
+	[pallet_collective, Council]
+	[pallet_motion, Motion]
+	// Collation support
+	[pallet_collator_selection, CollatorSelection]
+	[pallet_session, SessionBench::<Runtime>]
+	// Scheduler
+	[pallet_scheduler, Scheduler]
+	// Preimage
+	[pallet_preimage, Preimage]
+	// XCM
+	[cumulus_pallet_xcmp_queue, XcmpQueue]
+	// TODO: intro xcm benchmarks
+	//[pallet_xcm, PolkadotXcm::<Runtime>]
+	[pallet_message_queue, MessageQueue]
+	// Contracts
+	[pallet_revive, Revive]
+	// Proxy
+	[pallet_proxy, Proxy]
+	// Multisig
+	[pallet_multisig, Multisig]
+	// Utility
+	[pallet_utility, Utility]
+	// Assets
+	[pallet_nfts, Nfts]
+	[pallet_assets, TrustBackedAssets]
+);

runtime/mainnet/src/config/assets.rs

@@ -9,8 +9,8 @@ use parachains_common::{AssetIdForTrustBackedAssets, CollectionId, ItemId, Signa
 use sp_runtime::traits::Verify;
 
 use crate::{
-	config::monetary::ExistentialDeposit, deposit, AccountId, Balance, Balances, BlockNumber,
-	Runtime, RuntimeEvent, DAYS,
+	config::monetary::ExistentialDeposit, deposit, weights, AccountId, Balance, Balances,
+	BlockNumber, Runtime, RuntimeEvent, DAYS,
 };
 
 /// We allow root to execute privileged asset operations.
@@ -53,7 +53,7 @@ impl pallet_assets::Config<TrustBackedAssetsInstance> for Runtime {
 	type RemoveItemsLimit = ConstU32<1000>;
 	type RuntimeEvent = RuntimeEvent;
 	type StringLimit = AssetsStringLimit;
-	type WeightInfo = pallet_assets::weights::SubstrateWeight<Self>;
+	type WeightInfo = weights::pallet_assets::WeightInfo<Runtime>;
 }
 
 parameter_types! {
@@ -101,7 +101,7 @@ impl pallet_nfts::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type StringLimit = ConstU32<256>;
 	type ValueLimit = ConstU32<256>;
-	type WeightInfo = pallet_nfts::weights::SubstrateWeight<Self>;
+	type WeightInfo = weights::pallet_nfts::WeightInfo<Runtime>;
 }
 
 #[cfg(test)]

runtime/mainnet/src/config/collation.rs

@@ -1,8 +1,8 @@
 use pop_runtime_common::{HOURS, SLOT_DURATION};
 
 use crate::{
-	parameter_types, AccountId, Aura, AuraId, Balances, CollatorSelection, ConstBool, ConstU32,
-	ConstU64, EnsureRoot, PalletId, Runtime, RuntimeEvent, Session, SessionKeys,
+	parameter_types, weights, AccountId, Aura, AuraId, Balances, CollatorSelection, ConstBool,
+	ConstU32, ConstU64, EnsureRoot, PalletId, Runtime, RuntimeEvent, Session, SessionKeys,
 };
 
 impl pallet_authorship::Config for Runtime {
@@ -37,6 +37,10 @@ impl pallet_collator_selection::Config for Runtime {
 	type Currency = Balances;
 	// Should be a multiple of session or things will get inconsistent.
 	type KickThreshold = Period;
+	#[cfg(feature = "runtime-benchmarks")]
+	// If configured to `0`, benchmarks underflows.
+	type MaxCandidates = ConstU32<10>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
 	type MaxCandidates = ConstU32<0>;
 	type MaxInvulnerables = ConstU32<20>;
 	type MinEligibleCollators = ConstU32<3>;
@@ -46,7 +50,7 @@ impl pallet_collator_selection::Config for Runtime {
 	type ValidatorId = AccountId;
 	type ValidatorIdOf = pallet_collator_selection::IdentityCollator;
 	type ValidatorRegistration = Session;
-	type WeightInfo = pallet_collator_selection::weights::SubstrateWeight<Runtime>;
+	type WeightInfo = weights::pallet_collator_selection::WeightInfo<Runtime>;
 }
 
 impl cumulus_pallet_aura_ext::Config for Runtime {}
@@ -61,7 +65,7 @@ impl pallet_session::Config for Runtime {
 	type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
 	type ValidatorId = AccountId;
 	type ValidatorIdOf = pallet_collator_selection::IdentityCollator;
-	type WeightInfo = pallet_session::weights::SubstrateWeight<Runtime>;
+	type WeightInfo = weights::pallet_session::WeightInfo<Runtime>;
 }
 
 #[cfg(test)]
@@ -154,8 +158,14 @@ mod tests {
 
 		#[test]
 		fn candidates_disabled() {
+			#[cfg(feature = "runtime-benchmarks")]
+			assert_eq!(
+				<<Runtime as pallet_collator_selection::Config>::MaxCandidates as Get<u32>>::get(),
+				10
+			);
 			// Disabled to start until sufficient distribution/value to allow candidates to provide
 			// candidacy bond
+			#[cfg(not(feature = "runtime-benchmarks"))]
 			assert_eq!(
 				<<Runtime as pallet_collator_selection::Config>::MaxCandidates as Get<u32>>::get(),
 				0

runtime/mainnet/src/config/governance.rs

@@ -10,7 +10,7 @@
 use sp_core::crypto::Ss58Codec;
 
 use crate::{
-	config::system::RuntimeBlockWeights, AccountId, Runtime, RuntimeCall, RuntimeEvent,
+	config::system::RuntimeBlockWeights, weights, AccountId, Runtime, RuntimeCall, RuntimeEvent,
 	RuntimeOrigin,
 };
 
@@ -40,7 +40,7 @@
 	pub SudoAddress: AccountId = AccountId::from_ss58check(SUDO_ADDRESS).expect("sudo address is valid SS58");
 }
 
 pub type CouncilCollective = pallet_collective::Instance1;
 impl pallet_collective::Config<CouncilCollective> for Runtime {
 	type Consideration = ();
 	type DefaultVote = pallet_collective::MoreThanMajorityThenPrimeDefaultVote;
@@ -54,7 +54,7 @@
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type SetMembersOrigin = EnsureRoot<AccountId>;
-	type WeightInfo = pallet_collective::weights::SubstrateWeight<Runtime>;
+	type WeightInfo = weights::pallet_collective::WeightInfo<Runtime>;
 }
 
 impl pallet_motion::Config for Runtime {
@@ -66,13 +66,13 @@
 	type SuperMajorityOrigin = AtLeastThreeFourthsOfCouncil;
 	// A unanimous council vote is needed.
 	type UnanimousOrigin = UnanimousCouncilVote;
-	type WeightInfo = pallet_motion::weights::SubstrateWeight<Runtime>;
+	type WeightInfo = weights::pallet_motion::WeightInfo<Runtime>;
 }
 
 impl pallet_sudo::Config for Runtime {
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = pallet_sudo::weights::SubstrateWeight<Runtime>;
+	type WeightInfo = weights::pallet_sudo::WeightInfo<Runtime>;
 }
 
 #[cfg(test)]

runtime/mainnet/src/config/mod.rs

@@ -1,5 +1,5 @@
 // Assets.
-mod assets;
+pub(crate) mod assets;
 // Collation.
 pub(crate) mod collation;
 /// Governance.

runtime/mainnet/src/config/monetary.rs

@@ -8,7 +8,7 @@
 use sp_runtime::traits::{AccountIdConversion, IdentityLookup};
 
 use crate::{
-	parameter_types, AccountId, Balance, Balances, BlockNumber, ConstU32, ConstU8,
+	parameter_types, weights, AccountId, Balance, Balances, BlockNumber, ConstU32, ConstU8,
 	ConstantMultiplier, EnsureRoot, PalletId, ResolveTo, Runtime, RuntimeEvent,
 	RuntimeFreezeReason, RuntimeHoldReason, SlowAdjustingFeeUpdate, System, VariantCountOf, DAYS,
 	EXISTENTIAL_DEPOSIT,
@@ -129,7 +129,7 @@
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type RuntimeHoldReason = RuntimeHoldReason;
-	type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>;
+	type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>;
 }
 
 parameter_types! {
@@ -164,7 +164,7 @@
 	type OnChargeTransaction = OnChargeTransaction;
 	type OperationalFeeMultiplier = ConstU8<5>;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = pallet_transaction_payment::weights::SubstrateWeight<Runtime>;
+	type WeightInfo = weights::pallet_transaction_payment::WeightInfo<Runtime>;
 	type WeightToFee = fee::WeightToFee;
 }
 
@@ -180,8 +180,8 @@
 pub struct BenchmarkHelper;
 #[cfg(feature = "runtime-benchmarks")]
 impl pallet_treasury::ArgumentsFactory<(), AccountId> for BenchmarkHelper {
 	fn create_asset_kind(_seed: u32) -> () {
 		()
 	}
 
 	fn create_beneficiary(seed: [u8; 32]) -> AccountId {
@@ -189,7 +189,7 @@
 		Balances::force_set_balance(
 			crate::RuntimeOrigin::root(),
 			account_id.clone().into(),
-			EXISTENTIAL_DEPOSIT,
+			ExistentialDeposit::get(),
 		)
 		.unwrap();
 		account_id
@@ -216,7 +216,7 @@
 	/// Never allow origins except via the proposals process.
 	type SpendOrigin = NeverEnsureOrigin<Balance>;
 	type SpendPeriod = SpendPeriod;
-	type WeightInfo = pallet_treasury::weights::SubstrateWeight<Runtime>;
+	type WeightInfo = weights::pallet_treasury::WeightInfo<Runtime>;
 }
 
 #[cfg(test)]

runtime/mainnet/src/config/proxy.rs

@@ -3,7 +3,7 @@ use pallet_nfts_sdk as pallet_nfts;
 use pop_runtime_common::proxy::{MaxPending, MaxProxies, ProxyType};
 
 use crate::{
-	config::assets::TrustBackedAssetsCall, deposit, parameter_types, Balance, Balances,
+	config::assets::TrustBackedAssetsCall, deposit, parameter_types, weights, Balance, Balances,
 	BlakeTwo256, Runtime, RuntimeCall, RuntimeEvent,
 };
 
@@ -115,7 +115,7 @@ impl pallet_proxy::Config for Runtime {
 	type ProxyType = ProxyType;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = pallet_proxy::weights::SubstrateWeight<Self>;
+	type WeightInfo = weights::pallet_proxy::WeightInfo<Self>;
 }
 
 #[cfg(test)]

runtime/mainnet/src/config/revive.rs

@@ -5,7 +5,7 @@ use frame_support::{
 use frame_system::EnsureSigned;
 
 use crate::{
-	deposit, Balance, Balances, Perbill, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent,
+	deposit, weights, Balance, Balances, Perbill, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent,
 	RuntimeHoldReason, Timestamp, TransactionPayment, UNIT,
 };
 
@@ -46,7 +46,7 @@ impl pallet_revive::Config for Runtime {
 	// Disables access to unsafe host fns such as xcm_send.
 	type UnsafeUnstableInterface = ConstBool<false>;
 	type UploadOrigin = EnsureSigned<Self::AccountId>;
-	type WeightInfo = pallet_revive::weights::SubstrateWeight<Self>;
+	type WeightInfo = weights::pallet_revive::WeightInfo<Self>;
 	type WeightPrice = TransactionPayment;
 	type Xcm = PolkadotXcm;
 }

runtime/mainnet/src/config/system.rs

@@ -14,7 +14,7 @@ use sp_runtime::traits::AccountIdLookup;
 #[allow(unused_imports)]
 use crate::Executive;
 use crate::{
-	parameter_types,
+	parameter_types, weights,
 	weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight},
 	AccountId, AggregateMessageOrigin, Aura, Balance, BlakeTwo256, Block, BlockLength,
 	BlockWeights, DispatchClass, Hash, MessageQueue, PalletInfo, Runtime, RuntimeCall,
@@ -87,7 +87,7 @@ impl frame_system::Config for Runtime {
 	/// The weight of database operations that the runtime can invoke.
 	type DbWeight = RocksDbWeight;
 	/// Weight information for the extensions of this pallet.
-	type ExtensionsWeightInfo = ();
+	type ExtensionsWeightInfo = weights::frame_system_extensions::WeightInfo<Runtime>;
 	/// The type for hashing blocks and tries.
 	type Hash = Hash;
 	/// The default hashing algorithm used.
@@ -122,7 +122,7 @@ impl frame_system::Config for Runtime {
 	type SS58Prefix = SS58Prefix;
 	type SingleBlockMigrations = ();
 	/// Weight information for the extrinsics of this pallet.
-	type SystemWeightInfo = frame_system::weights::SubstrateWeight<Self>;
+	type SystemWeightInfo = weights::frame_system::WeightInfo<Self>;
 	/// Runtime version.
 	type Version = Version;
 }
@@ -159,7 +159,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type SelectCore = cumulus_pallet_parachain_system::LookaheadCoreSelector<Runtime>;
 	type SelfParaId = parachain_info::Pallet<Runtime>;
-	type WeightInfo = cumulus_pallet_parachain_system::weights::SubstrateWeight<Runtime>;
+	type WeightInfo = weights::cumulus_pallet_parachain_system::WeightInfo<Runtime>;
 	type XcmpMessageHandler = XcmpQueue;
 }
 
@@ -168,7 +168,7 @@ impl pallet_timestamp::Config for Runtime {
 	/// A timestamp: milliseconds since the unix epoch.
 	type Moment = u64;
 	type OnTimestampSet = Aura;
-	type WeightInfo = pallet_timestamp::weights::SubstrateWeight<Runtime>;
+	type WeightInfo = weights::pallet_timestamp::WeightInfo<Runtime>;
 }
 
 impl parachain_info::Config for Runtime {}
@@ -452,7 +452,6 @@ mod tests {
 		}
 
 		#[test]
-		#[ignore]
 		fn extensions_do_not_use_default_weights() {
 			assert_ne!(
 				TypeId::of::<<Runtime as frame_system::Config>::ExtensionsWeightInfo>(),