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

FRAME: Fix the Referenda confirming alarm (#13704)

Browse Source 
* Fix the Referenda confirming alarm

* Add minimal regression test

This fails on 40e1704e1c since the
downwards rounding voids the curve delay.

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
This commit is contained in:
Gavin Wood
2023-03-27 14:04:24 +02:00
committed by GitHub
parent f5e257298a
commit a3b1c1d941
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/referenda/src/lib.rs
+1 -1
View File
@@ -1206,7 +1206,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
let until_approval = track.min_approval.delay(approval); let until_approval = track.min_approval.delay(approval);
let until_support = track.min_support.delay(support); let until_support = track.min_support.delay(support);
let offset = until_support.max(until_approval); let offset = until_support.max(until_approval);
deciding.since.saturating_add(offset * track.decision_period) deciding.since.saturating_add(offset.mul_ceil(track.decision_period))
}) })
} }
substrate/frame/referenda/src/tests.rs
+18
View File
@@ -286,6 +286,24 @@ fn alarm_interval_works() {
}); });
} }
#[test]
fn decision_time_is_correct() {
new_test_ext().execute_with(|| {
let decision_time = |since: u64| {
Pallet::<Test>::decision_time(
&DecidingStatus { since: since.into(), confirming: None },
&Tally { ayes: 100, nays: 5 },
TestTracksInfo::tracks()[0].0,
&TestTracksInfo::tracks()[0].1,
)
};
for i in 0u64..=100 {
assert!(decision_time(i) > i, "The decision time should be delayed by the curve");
}
});
}
#[test] #[test]
fn auto_timeout_should_happen_with_nothing_but_submit() { fn auto_timeout_should_happen_with_nothing_but_submit() {
new_test_ext().execute_with(|| { new_test_ext().execute_with(|| {