some more weight renames

paritytech · Jul 26, 2024 · 64b367c · 64b367c
1 parent ce6d0ac
commit 64b367c
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 15 deletions.
diff --git a/polkadot/runtime/parachains/src/builder.rs b/polkadot/runtime/parachains/src/builder.rs
@@ -516,7 +516,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
 					para_id,
 					core_idx,
 					group_idx,
-					bitvec::bitvec![u8, bitvec::order::Lsb0; 1; validators.len()],
+					bitvec::bitvec![u8, bitvec::order::Lsb0; 0; validators.len()],
 					CandidateHash(H256::from(byte32_slice_from(current_core_idx))),
 				);
 				if !self.unavailable_cores.contains(&current_core_idx) {

diff --git a/polkadot/runtime/westend/src/impls.rs b/polkadot/runtime/westend/src/impls.rs
@@ -90,7 +90,7 @@ where
 	fn on_reap_identity(who: &AccountId, fields: u32, subs: u32) -> DispatchResult {
 		use crate::{
 			impls::IdentityMigratorCalls::PokeDeposit,
-			weights::runtime_common_identity_migrator::WeightInfo as MigratorWeights,
+			weights::polkadot_runtime_common_identity_migrator::WeightInfo as MigratorWeights,
 		};
 
 		let total_to_send = Self::calculate_remote_deposit(fields, subs);

diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
@@ -1103,7 +1103,8 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 				matches!(
 					c,
 					RuntimeCall::Staking(..) |
-						RuntimeCall::Session(..) | RuntimeCall::Utility(..) |
+						RuntimeCall::Session(..) |
+						RuntimeCall::Utility(..) |
 						RuntimeCall::FastUnstake(..) |
 						RuntimeCall::VoterList(..) |
 						RuntimeCall::NominationPools(..)
@@ -1354,7 +1355,7 @@ impl assigned_slots::Config for Runtime {
 	type PermanentSlotLeasePeriodLength = PermanentSlotLeasePeriodLength;
 	type TemporarySlotLeasePeriodLength = TemporarySlotLeasePeriodLength;
 	type MaxTemporarySlotPerLeasePeriod = MaxTemporarySlotPerLeasePeriod;
-	type WeightInfo = weights::runtime_common_assigned_slots::WeightInfo<Runtime>;
+	type WeightInfo = weights::polkadot_runtime_common_assigned_slots::WeightInfo<Runtime>;
 }
 
 impl parachains_disputes::Config for Runtime {
@@ -1393,7 +1394,7 @@ impl paras_registrar::Config for Runtime {
 	type OnSwap = (Crowdloan, Slots, SwapLeases);
 	type ParaDeposit = ParaDeposit;
 	type DataDepositPerByte = RegistrarDataDepositPerByte;
-	type WeightInfo = weights::runtime_common_paras_registrar::WeightInfo<Runtime>;
+	type WeightInfo = weights::polkadot_runtime_common_paras_registrar::WeightInfo<Runtime>;
 }
 
 parameter_types! {
@@ -1407,7 +1408,7 @@ impl slots::Config for Runtime {
 	type LeasePeriod = LeasePeriod;
 	type LeaseOffset = ();
 	type ForceOrigin = EitherOf<EnsureRoot<Self::AccountId>, LeaseAdmin>;
-	type WeightInfo = weights::runtime_common_slots::WeightInfo<Runtime>;
+	type WeightInfo = weights::polkadot_runtime_common_slots::WeightInfo<Runtime>;
 }
 
 parameter_types! {
@@ -1428,7 +1429,7 @@ impl crowdloan::Config for Runtime {
 	type Registrar = Registrar;
 	type Auctioneer = Auctions;
 	type MaxMemoLength = MaxMemoLength;
-	type WeightInfo = weights::runtime_common_crowdloan::WeightInfo<Runtime>;
+	type WeightInfo = weights::polkadot_runtime_common_crowdloan::WeightInfo<Runtime>;
 }
 
 parameter_types! {
@@ -1447,14 +1448,14 @@ impl auctions::Config for Runtime {
 	type SampleLength = SampleLength;
 	type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
 	type InitiateOrigin = EitherOf<EnsureRoot<Self::AccountId>, AuctionAdmin>;
-	type WeightInfo = weights::runtime_common_auctions::WeightInfo<Runtime>;
+	type WeightInfo = weights::polkadot_runtime_common_auctions::WeightInfo<Runtime>;
 }
 
 impl identity_migrator::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Reaper = EnsureSigned<AccountId>;
 	type ReapIdentityHandler = ToParachainIdentityReaper<Runtime, Self::AccountId>;
-	type WeightInfo = weights::runtime_common_identity_migrator::WeightInfo<Runtime>;
+	type WeightInfo = weights::polkadot_runtime_common_identity_migrator::WeightInfo<Runtime>;
 }
 
 parameter_types! {

diff --git a/polkadot/runtime/westend/src/weights/mod.rs b/polkadot/runtime/westend/src/weights/mod.rs
@@ -44,6 +44,12 @@ pub mod pallet_utility;
 pub mod pallet_vesting;
 pub mod pallet_whitelist;
 pub mod pallet_xcm;
+pub mod polkadot_runtime_common_assigned_slots;
+pub mod polkadot_runtime_common_auctions;
+pub mod polkadot_runtime_common_crowdloan;
+pub mod polkadot_runtime_common_identity_migrator;
+pub mod polkadot_runtime_common_paras_registrar;
+pub mod polkadot_runtime_common_slots;
 pub mod polkadot_runtime_parachains_configuration;
 pub mod polkadot_runtime_parachains_coretime;
 pub mod polkadot_runtime_parachains_disputes;
@@ -54,10 +60,4 @@ pub mod polkadot_runtime_parachains_initializer;
 pub mod polkadot_runtime_parachains_on_demand;
 pub mod polkadot_runtime_parachains_paras;
 pub mod polkadot_runtime_parachains_paras_inherent;
-pub mod runtime_common_assigned_slots;
-pub mod runtime_common_auctions;
-pub mod runtime_common_crowdloan;
-pub mod runtime_common_identity_migrator;
-pub mod runtime_common_paras_registrar;
-pub mod runtime_common_slots;
 pub mod xcm;
diff --git a/.../weights/runtime_common_assigned_slots.rs → ...polkadot_runtime_common_assigned_slots.rs b/.../weights/runtime_common_assigned_slots.rs → ...polkadot_runtime_common_assigned_slots.rs
diff --git a/...nd/src/weights/runtime_common_auctions.rs → ...ights/polkadot_runtime_common_auctions.rs b/...nd/src/weights/runtime_common_auctions.rs → ...ights/polkadot_runtime_common_auctions.rs
diff --git a/...d/src/weights/runtime_common_crowdloan.rs → ...ghts/polkadot_runtime_common_crowdloan.rs b/...d/src/weights/runtime_common_crowdloan.rs → ...ghts/polkadot_runtime_common_crowdloan.rs
diff --git a/...ights/runtime_common_identity_migrator.rs → ...kadot_runtime_common_identity_migrator.rs b/...ights/runtime_common_identity_migrator.rs → ...kadot_runtime_common_identity_migrator.rs
diff --git a/...weights/runtime_common_paras_registrar.rs → ...olkadot_runtime_common_paras_registrar.rs b/...weights/runtime_common_paras_registrar.rs → ...olkadot_runtime_common_paras_registrar.rs
diff --git a/...stend/src/weights/runtime_common_slots.rs → .../weights/polkadot_runtime_common_slots.rs b/...stend/src/weights/runtime_common_slots.rs → .../weights/polkadot_runtime_common_slots.rs