diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs index 75cd3da8bc..ac28a26466 100644 --- a/relay/kusama/src/lib.rs +++ b/relay/kusama/src/lib.rs @@ -327,7 +327,7 @@ impl pallet_balances::Config for Runtime { type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; - type WeightInfo = weights::pallet_balances_balances::WeightInfo; + type WeightInfo = weights::pallet_balances_native::WeightInfo; type FreezeIdentifier = RuntimeFreezeReason; type MaxFreezes = ConstU32<8>; type RuntimeHoldReason = RuntimeHoldReason; @@ -1406,7 +1406,7 @@ impl pallet_balances::Config for Runtime { type MaxLocks = ConstU32<4>; type MaxReserves = ConstU32<4>; type ReserveIdentifier = [u8; 8]; - type WeightInfo = weights::pallet_balances_nis_counterpart_balances::WeightInfo; + type WeightInfo = weights::pallet_balances_nis::WeightInfo; type RuntimeHoldReason = RuntimeHoldReason; type RuntimeFreezeReason = RuntimeFreezeReason; type FreezeIdentifier = (); @@ -1591,7 +1591,6 @@ construct_runtime! { // NIS pallet. Nis: pallet_nis::{Pallet, Call, Storage, Event, HoldReason} = 38, -// pub type NisCounterpartInstance = pallet_balances::Instance2; NisCounterpartBalances: pallet_balances:: = 45, // Provides a semi-sorted list of nominators for staking. @@ -1721,8 +1720,8 @@ mod benches { [runtime_parachains::paras_inherent, ParaInherent] [runtime_parachains::paras, Paras] // Substrate - [pallet_balances, Balances] - [pallet_balances, NisCounterpartBalances] + [pallet_balances, Native] + [pallet_balances, Nis] [pallet_bags_list, VoterList] [frame_benchmarking::baseline, Baseline::] [pallet_bounties, Bounties] @@ -2281,6 +2280,13 @@ sp_api::impl_runtime_apis! { use pallet_nomination_pools_benchmarking::Pallet as NominationPoolsBench; use frame_benchmarking::baseline::Pallet as Baseline; + // Benchmark files generated for `Balances/NisCounterpartBalances` instances are by default + // `pallet_balances_balances.rs / pallet_balances_nis_counterpart_balances`, which is not really nice, + // so with this redefinition we can change names to nicer: + // `pallet_balances_native.rs / pallet_balances_nis.rs`. + type Native = pallet_balances::Pallet::; + type Nis = pallet_balances::Pallet::; + let mut list = Vec::::new(); list_benchmarks!(list, extra); @@ -2421,6 +2427,9 @@ sp_api::impl_runtime_apis! { } } + type Native = pallet_balances::Pallet::; + type Nis = pallet_balances::Pallet::; + let mut whitelist: Vec = AllPalletsWithSystem::whitelisted_storage_keys(); let treasury_key = frame_system::Account::::hashed_key_for(Treasury::account_id()); whitelist.push(treasury_key.to_vec().into()); diff --git a/relay/kusama/src/weights/mod.rs b/relay/kusama/src/weights/mod.rs index 5e3b1d22b2..a9a9f4bce7 100644 --- a/relay/kusama/src/weights/mod.rs +++ b/relay/kusama/src/weights/mod.rs @@ -19,8 +19,8 @@ pub mod frame_election_provider_support; pub mod frame_system; pub mod pallet_asset_rate; pub mod pallet_bags_list; -pub mod pallet_balances_balances; -pub mod pallet_balances_nis_counterpart_balances; +pub mod pallet_balances_native; +pub mod pallet_balances_nis; pub mod pallet_bounties; pub mod pallet_child_bounties; pub mod pallet_conviction_voting; diff --git a/relay/kusama/src/weights/pallet_balances_balances.rs b/relay/kusama/src/weights/pallet_balances_native.rs similarity index 100% rename from relay/kusama/src/weights/pallet_balances_balances.rs rename to relay/kusama/src/weights/pallet_balances_native.rs diff --git a/relay/kusama/src/weights/pallet_balances_nis_counterpart_balances.rs b/relay/kusama/src/weights/pallet_balances_nis.rs similarity index 100% rename from relay/kusama/src/weights/pallet_balances_nis_counterpart_balances.rs rename to relay/kusama/src/weights/pallet_balances_nis.rs