Skip to content

Commit

Permalink
Companion for paritytech/substrate#9569 (#3662)
Browse files Browse the repository at this point in the history 
* Fix weights

* Fix more

* update Substrate

* fmt

Co-authored-by: parity-processbot <>
  • Loading branch information
@kianenigma
kianenigma authored Aug 19, 2021
1 parent 92cee09 commit e2eb9bc
Show file tree
Hide file tree
Showing 4 changed files with 270 additions and 139 deletions.
136 changes: 90 additions & 46 deletions polkadot/runtime/kusama/src/weights/pallet_election_provider_multi_phase.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,69 +42,113 @@ use sp_std::marker::PhantomData;
/// Weight functions for `pallet_election_provider_multi_phase`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> pallet_election_provider_multi_phase::WeightInfo for WeightInfo<T> {
// Storage: Staking CurrentEra (r:1 w:0)
// Storage: Staking CurrentPlannedSession (r:1 w:0)
// Storage: Staking ErasStartSessionIndex (r:1 w:0)
// Storage: Babe EpochIndex (r:1 w:0)
// Storage: Babe GenesisSlot (r:1 w:0)
// Storage: Babe CurrentSlot (r:1 w:0)
// Storage: Staking ForceEra (r:1 w:0)
// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
fn on_initialize_nothing() -> Weight {
(22_984_000 as Weight).saturating_add(T::DbWeight::get().reads(8 as Weight))
(23_878_000 as Weight).saturating_add(T::DbWeight::get().reads(8 as Weight))
}
// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
fn on_initialize_open_signed() -> Weight {
(83_667_000 as Weight)
.saturating_add(T::DbWeight::get().reads(10 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
(34_547_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
fn on_initialize_open_unsigned_with_snapshot() -> Weight {
(83_403_000 as Weight)
.saturating_add(T::DbWeight::get().reads(10 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
fn on_initialize_open_unsigned() -> Weight {
(33_568_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
fn on_initialize_open_unsigned_without_snapshot() -> Weight {
(18_070_000 as Weight)
// Storage: System Account (r:1 w:1)
// Storage: ElectionProviderMultiPhase QueuedSolution (r:0 w:1)
fn finalize_signed_phase_accept_solution() -> Weight {
(50_596_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
// Storage: System Account (r:1 w:1)
fn finalize_signed_phase_reject_solution() -> Weight {
(33_389_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
fn elect_queued(_v: u32, _t: u32, _a: u32, _d: u32) -> Weight {
(8_641_847_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:0 w:1)
// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
fn create_snapshot_internal() -> Weight {
(8_835_233_000 as Weight).saturating_add(T::DbWeight::get().writes(3 as Weight))
}
// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1)
// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:1)
// Storage: ElectionProviderMultiPhase SignedSubmissionsMap (r:1 w:0)
// Storage: ElectionProviderMultiPhase QueuedSolution (r:1 w:1)
// Storage: ElectionProviderMultiPhase Round (r:1 w:1)
// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
fn elect_queued(a: u32, d: u32) -> Weight {
(82_395_000 as Weight)
// Standard Error: 1_000
.saturating_add((1_769_000 as Weight).saturating_mul(a as Weight))
// Standard Error: 13_000
.saturating_add((320_000 as Weight).saturating_mul(d as Weight))
.saturating_add(T::DbWeight::get().reads(6 as Weight))
.saturating_add(T::DbWeight::get().writes(8 as Weight))
}
// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1)
// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:0)
// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
// Storage: ElectionProviderMultiPhase SignedSubmissionsMap (r:0 w:1)
fn submit(c: u32) -> Weight {
(84_430_000 as Weight)
// Standard Error: 146_000
.saturating_add((2_758_000 as Weight).saturating_mul(c as Weight))
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
(77_368_000 as Weight)
// Standard Error: 9_000
.saturating_add((369_000 as Weight).saturating_mul(c as Weight))
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
// Storage: ElectionProviderMultiPhase DesiredTargets (r:1 w:0)
// Storage: ElectionProviderMultiPhase QueuedSolution (r:1 w:1)
// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:0)
// Storage: ElectionProviderMultiPhase MinimumUntrustedScore (r:1 w:0)
// Storage: ElectionProviderMultiPhase Snapshot (r:1 w:0)
fn submit_unsigned(v: u32, t: u32, a: u32, d: u32) -> Weight {
(0 as Weight)
// Standard Error: 13_000
.saturating_add((4_805_000 as Weight).saturating_mul(v as Weight))
// Standard Error: 44_000
.saturating_add((305_000 as Weight).saturating_mul(t as Weight))
// Standard Error: 13_000
.saturating_add((16_090_000 as Weight).saturating_mul(a as Weight))
// Standard Error: 67_000
.saturating_add((5_619_000 as Weight).saturating_mul(d as Weight))
// Standard Error: 4_000
.saturating_add((3_553_000 as Weight).saturating_mul(v as Weight))
// Standard Error: 23_000
.saturating_add((35_000 as Weight).saturating_mul(t as Weight))
// Standard Error: 7_000
.saturating_add((10_600_000 as Weight).saturating_mul(a as Weight))
// Standard Error: 59_000
.saturating_add((6_128_000 as Weight).saturating_mul(d as Weight))
.saturating_add(T::DbWeight::get().reads(7 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
fn feasibility_check(v: u32, t: u32, a: u32, d: u32) -> Weight {
// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
// Storage: ElectionProviderMultiPhase DesiredTargets (r:1 w:0)
// Storage: ElectionProviderMultiPhase MinimumUntrustedScore (r:1 w:0)
// Storage: ElectionProviderMultiPhase Snapshot (r:1 w:0)
fn feasibility_check(v: u32, _t: u32, a: u32, d: u32) -> Weight {
(0 as Weight)
// Standard Error: 8_000
.saturating_add((4_729_000 as Weight).saturating_mul(v as Weight))
// Standard Error: 29_000
.saturating_add((124_000 as Weight).saturating_mul(t as Weight))
// Standard Error: 8_000
.saturating_add((13_511_000 as Weight).saturating_mul(a as Weight))
// Standard Error: 44_000
.saturating_add((4_469_000 as Weight).saturating_mul(d as Weight))
// Standard Error: 3_000
.saturating_add((3_478_000 as Weight).saturating_mul(v as Weight))
// Standard Error: 6_000
.saturating_add((8_930_000 as Weight).saturating_mul(a as Weight))
// Standard Error: 47_000
.saturating_add((5_199_000 as Weight).saturating_mul(d as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
}
fn finalize_signed_phase_accept_solution() -> Weight {
(47_783_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
fn finalize_signed_phase_reject_solution() -> Weight {
(21_277_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
}
136 changes: 90 additions & 46 deletions polkadot/runtime/polkadot/src/weights/pallet_election_provider_multi_phase.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,69 +42,113 @@ use sp_std::marker::PhantomData;
/// Weight functions for `pallet_election_provider_multi_phase`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> pallet_election_provider_multi_phase::WeightInfo for WeightInfo<T> {
// Storage: Staking CurrentEra (r:1 w:0)
// Storage: Staking CurrentPlannedSession (r:1 w:0)
// Storage: Staking ErasStartSessionIndex (r:1 w:0)
// Storage: Babe EpochIndex (r:1 w:0)
// Storage: Babe GenesisSlot (r:1 w:0)
// Storage: Babe CurrentSlot (r:1 w:0)
// Storage: Staking ForceEra (r:1 w:0)
// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
fn on_initialize_nothing() -> Weight {
(23_244_000 as Weight).saturating_add(T::DbWeight::get().reads(8 as Weight))
(23_878_000 as Weight).saturating_add(T::DbWeight::get().reads(8 as Weight))
}
// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
fn on_initialize_open_signed() -> Weight {
(82_453_000 as Weight)
.saturating_add(T::DbWeight::get().reads(10 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
fn on_initialize_open_unsigned_with_snapshot() -> Weight {
(81_883_000 as Weight)
.saturating_add(T::DbWeight::get().reads(10 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
fn on_initialize_open_unsigned_without_snapshot() -> Weight {
(17_601_000 as Weight)
(34_547_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
fn elect_queued(_v: u32, _t: u32, _a: u32, _d: u32) -> Weight {
(5_408_539_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
fn submit_unsigned(v: u32, t: u32, a: u32, d: u32) -> Weight {
(0 as Weight)
// Standard Error: 15_000
.saturating_add((3_352_000 as Weight).saturating_mul(v as Weight))
// Standard Error: 52_000
.saturating_add((150_000 as Weight).saturating_mul(t as Weight))
// Standard Error: 15_000
.saturating_add((10_531_000 as Weight).saturating_mul(a as Weight))
// Standard Error: 78_000
.saturating_add((3_302_000 as Weight).saturating_mul(d as Weight))
.saturating_add(T::DbWeight::get().reads(7 as Weight))
// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
fn on_initialize_open_unsigned() -> Weight {
(33_568_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
fn feasibility_check(v: u32, t: u32, a: u32, d: u32) -> Weight {
(0 as Weight)
// Standard Error: 10_000
.saturating_add((3_365_000 as Weight).saturating_mul(v as Weight))
// Standard Error: 34_000
.saturating_add((295_000 as Weight).saturating_mul(t as Weight))
// Standard Error: 10_000
.saturating_add((8_438_000 as Weight).saturating_mul(a as Weight))
// Standard Error: 52_000
.saturating_add((3_606_000 as Weight).saturating_mul(d as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
}
// Storage: System Account (r:1 w:1)
// Storage: ElectionProviderMultiPhase QueuedSolution (r:0 w:1)
fn finalize_signed_phase_accept_solution() -> Weight {
(47_783_000 as Weight)
(50_596_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
// Storage: System Account (r:1 w:1)
fn finalize_signed_phase_reject_solution() -> Weight {
(21_277_000 as Weight)
(33_389_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:0 w:1)
// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
fn create_snapshot_internal() -> Weight {
(8_835_233_000 as Weight).saturating_add(T::DbWeight::get().writes(3 as Weight))
}
// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1)
// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:1)
// Storage: ElectionProviderMultiPhase SignedSubmissionsMap (r:1 w:0)
// Storage: ElectionProviderMultiPhase QueuedSolution (r:1 w:1)
// Storage: ElectionProviderMultiPhase Round (r:1 w:1)
// Storage: ElectionProviderMultiPhase DesiredTargets (r:0 w:1)
// Storage: ElectionProviderMultiPhase Snapshot (r:0 w:1)
// Storage: ElectionProviderMultiPhase CurrentPhase (r:0 w:1)
fn elect_queued(a: u32, d: u32) -> Weight {
(82_395_000 as Weight)
// Standard Error: 1_000
.saturating_add((1_769_000 as Weight).saturating_mul(a as Weight))
// Standard Error: 13_000
.saturating_add((320_000 as Weight).saturating_mul(d as Weight))
.saturating_add(T::DbWeight::get().reads(6 as Weight))
.saturating_add(T::DbWeight::get().writes(8 as Weight))
}
// Storage: ElectionProviderMultiPhase SignedSubmissionIndices (r:1 w:1)
// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:0)
// Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
// Storage: ElectionProviderMultiPhase SignedSubmissionNextIndex (r:1 w:1)
// Storage: ElectionProviderMultiPhase SignedSubmissionsMap (r:0 w:1)
fn submit(c: u32) -> Weight {
(78_972_000 as Weight)
// Standard Error: 16_000
.saturating_add((308_000 as Weight).saturating_mul(c as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
(77_368_000 as Weight)
// Standard Error: 9_000
.saturating_add((369_000 as Weight).saturating_mul(c as Weight))
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
// Storage: ElectionProviderMultiPhase CurrentPhase (r:1 w:0)
// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
// Storage: ElectionProviderMultiPhase DesiredTargets (r:1 w:0)
// Storage: ElectionProviderMultiPhase QueuedSolution (r:1 w:1)
// Storage: ElectionProviderMultiPhase SnapshotMetadata (r:1 w:0)
// Storage: ElectionProviderMultiPhase MinimumUntrustedScore (r:1 w:0)
// Storage: ElectionProviderMultiPhase Snapshot (r:1 w:0)
fn submit_unsigned(v: u32, t: u32, a: u32, d: u32) -> Weight {
(0 as Weight)
// Standard Error: 4_000
.saturating_add((3_553_000 as Weight).saturating_mul(v as Weight))
// Standard Error: 23_000
.saturating_add((35_000 as Weight).saturating_mul(t as Weight))
// Standard Error: 7_000
.saturating_add((10_600_000 as Weight).saturating_mul(a as Weight))
// Standard Error: 59_000
.saturating_add((6_128_000 as Weight).saturating_mul(d as Weight))
.saturating_add(T::DbWeight::get().reads(7 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: ElectionProviderMultiPhase Round (r:1 w:0)
// Storage: ElectionProviderMultiPhase DesiredTargets (r:1 w:0)
// Storage: ElectionProviderMultiPhase MinimumUntrustedScore (r:1 w:0)
// Storage: ElectionProviderMultiPhase Snapshot (r:1 w:0)
fn feasibility_check(v: u32, _t: u32, a: u32, d: u32) -> Weight {
(0 as Weight)
// Standard Error: 3_000
.saturating_add((3_478_000 as Weight).saturating_mul(v as Weight))
// Standard Error: 6_000
.saturating_add((8_930_000 as Weight).saturating_mul(a as Weight))
// Standard Error: 47_000
.saturating_add((5_199_000 as Weight).saturating_mul(d as Weight))
.saturating_add(T::DbWeight::get().reads(4 as Weight))
}
}
1 change: 0 additions & 1 deletion polkadot/runtime/test-runtime/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,6 @@ parameter_types! {
impl frame_election_provider_support::onchain::Config for Runtime {
type AccountId = <Self as frame_system::Config>::AccountId;
type BlockNumber = <Self as frame_system::Config>::BlockNumber;
type BlockWeights = ();
type Accuracy = sp_runtime::Perbill;
type DataProvider = Staking;
}
Expand Down
Loading

0 comments on commit e2eb9bc

Please sign in to comment.