Remove Ord impl for Weights V2 and add comparison fns (#12183)

* Remove Ord impl for Weights V2 and add comparison fns

* Remove TODO

* Update frame/multisig/src/lib.rs

Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Update frame/election-provider-multi-phase/src/unsigned.rs

Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Remove unused import

* cargo fmt

* Fix tests

* Fix more tests

* cargo fmt

* Fix more tests

* Update frame/contracts/src/wasm/mod.rs

Co-authored-by: Alexander Theißen <alex.theissen@me.com>

* Update weight benchmarking templates

Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Alexander Theißen <alex.theissen@me.com>
This commit is contained in:
Keith Yeung
2022-09-08 12:22:41 +08:00
committed by GitHub
parent 09ec484139
commit 6ce4d45175
23 changed files with 156 additions and 82 deletions
+1 -1
View File
@@ -368,7 +368,7 @@ pub mod pallet {
let hard_deadline = s.priority <= schedule::HARD_DEADLINE;
let test_weight =
total_weight.saturating_add(call_weight).saturating_add(item_weight);
if !hard_deadline && order > 0 && test_weight > limit {
if !hard_deadline && order > 0 && test_weight.any_gt(limit) {
// Cannot be scheduled this block - postpone until next.
total_weight.saturating_accrue(T::WeightInfo::item(false, named, None));
if let Some(ref id) = s.maybe_id {