pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-19 06:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix democracy on-initialize weight (#9890)

Browse Source 
* fix democracy on-initialize weight

* fix tests

* add base weight on LaunchPeriod

* fix fmt check

* trigger GitHub actions

* trigger GitHub actions

* update weights
This commit is contained in:
zjb0807
2021-09-30 21:22:54 +08:00
committed by GitHub
parent a58b5a947f
commit fc4c67161b
3 changed files with 174 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/democracy/src/lib.rs
+17 -10
View File
@@ -1726,7 +1726,8 @@ impl<T: Config> Pallet<T> {
///
///
/// # <weight>
/// If a referendum is launched or maturing, this will take full block weight. Otherwise:
/// If a referendum is launched or maturing, this will take full block weight if queue is not
/// empty. Otherwise:
/// - Complexity: `O(R)` where `R` is the number of unbaked referenda.
/// - Db reads: `LastTabledWasExternal`, `NextExternal`, `PublicProps`, `account`,
/// `ReferendumCount`, `LowestUnbaked`
@@ -1737,18 +1738,24 @@ impl<T: Config> Pallet<T> {
let max_block_weight = T::BlockWeights::get().max_block;
let mut weight = 0;
// pick out another public referendum if it's time.
if (now % T::LaunchPeriod::get()).is_zero() {
// Errors come from the queue being empty. we don't really care about that, and even if
// we did, there is nothing we can do here.
let _ = Self::launch_next(now);
weight = max_block_weight;
}
let next = Self::lowest_unbaked();
let last = Self::referendum_count();
let r = last.saturating_sub(next);
weight = weight.saturating_add(T::WeightInfo::on_initialize_base(r));
// pick out another public referendum if it's time.
if (now % T::LaunchPeriod::get()).is_zero() {
// Errors come from the queue being empty. If the queue is not empty, it will take
// full block weight.
if Self::launch_next(now).is_ok() {
weight = max_block_weight;
} else {
weight =
weight.saturating_add(T::WeightInfo::on_initialize_base_with_launch_period(r));
}
} else {
weight = weight.saturating_add(T::WeightInfo::on_initialize_base(r));
}
// tally up votes for any expiring referenda.
for (index, info) in Self::maturing_referenda_at_inner(now, next..last).into_iter() {
let approved = Self::bake_referendum(now, index, info)?;