choir: re enable weights that became outdated on v1.5 bump

paritytech · Feb 15, 2024 · 0417a82 · 0417a82
1 parent b837a38
commit 0417a82
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/runtime/trappist/src/lib.rs b/runtime/trappist/src/lib.rs
@@ -396,9 +396,7 @@ impl pallet_collator_selection::Config for Runtime {
 	type ValidatorId = <Self as frame_system::Config>::AccountId;
 	type ValidatorIdOf = pallet_collator_selection::IdentityCollator;
 	type ValidatorRegistration = Session;
-	type WeightInfo = ();
-	// TODO: Recalculate on v1.5
-	// type WeightInfo = weights::pallet_collator_selection::WeightInfo<Runtime>;
+	type WeightInfo = weights::pallet_collator_selection::WeightInfo<Runtime>;
 }
 
 impl pallet_sudo::Config for Runtime {
@@ -482,9 +480,7 @@ impl pallet_identity::Config for Runtime {
 	type Slashed = ();
 	type ForceOrigin = EnsureRootOrHalfCouncil;
 	type RegistrarOrigin = EnsureRootOrHalfCouncil;
-	//TODO: Recalculate weights for v1.5
-	// type WeightInfo = weights::pallet_identity::WeightInfo<Runtime>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_identity::WeightInfo<Runtime>;
 }
 
 parameter_types! {

diff --git a/runtime/trappist/src/weights/mod.rs b/runtime/trappist/src/weights/mod.rs
@@ -22,20 +22,17 @@ use xcm_primitives::DropAssetsWeigher;
 use crate::Runtime;
 
 pub mod block_weights;
-//TODO: re enable when calculated for v1.5
-// pub mod cumulus_pallet_xcmp_queue;
+pub mod cumulus_pallet_xcmp_queue;
 pub mod extrinsic_weights;
 pub mod frame_system;
 pub mod pallet_asset_registry;
 pub mod pallet_assets;
 pub mod pallet_balances;
-// pub mod pallet_collator_selection;
+pub mod pallet_collator_selection;
 pub mod pallet_collective;
 pub mod pallet_contracts;
 pub mod pallet_democracy;
-//TODO: re enable when calculated for v1.5
-
-// pub mod pallet_identity;
+pub mod pallet_identity;
 pub mod pallet_multisig;
 pub mod pallet_preimage;
 pub mod pallet_safe_mode;

diff --git a/runtime/trappist/src/xcm_config.rs b/runtime/trappist/src/xcm_config.rs
@@ -431,6 +431,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 		EnsureXcm<IsMajorityOfBody<RelayLocation, ExecutiveBody>>,
 	>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
+	// TODO:
 	// type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Runtime>;
 	type WeightInfo = ();
 	type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;