From 655fe9856d866c105bfa4a195f9b6726e0a7acb9 Mon Sep 17 00:00:00 2001 From: Andronik Date: Thu, 1 Sep 2022 21:03:19 +0200 Subject: [PATCH] post-merge fixes --- runtime/parachains/src/disputes.rs | 2 +- runtime/parachains/src/disputes/slashing.rs | 4 ++-- runtime/parachains/src/mock.rs | 2 +- .../src/weights/runtime_parachains_disputes_slashing.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/parachains/src/disputes.rs b/runtime/parachains/src/disputes.rs index 65f3cee622bb..7fffa001bffe 100644 --- a/runtime/parachains/src/disputes.rs +++ b/runtime/parachains/src/disputes.rs @@ -117,7 +117,7 @@ impl SlashingHandler for () { } fn initializer_initialize(_now: BlockNumber) -> Weight { - Weight::new() + Weight::zero() } fn initializer_finalize() {} diff --git a/runtime/parachains/src/disputes/slashing.rs b/runtime/parachains/src/disputes/slashing.rs index 631aff62ae23..afd032bec52d 100644 --- a/runtime/parachains/src/disputes/slashing.rs +++ b/runtime/parachains/src/disputes/slashing.rs @@ -400,7 +400,7 @@ pub trait WeightInfo { pub struct TestWeightInfo; impl WeightInfo for TestWeightInfo { fn report_dispute_lost(_validator_count: ValidatorSetCount) -> Weight { - Weight::new() + Weight::zero() } } @@ -566,7 +566,7 @@ pub mod pallet { impl Pallet { /// Called by the initializer to initialize the disputes slashing module. fn initializer_initialize(_now: T::BlockNumber) -> Weight { - Weight::new() + Weight::zero() } /// Called by the initializer to finalize the disputes slashing pallet. diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs index 762b6646dab7..1fc03098ce50 100644 --- a/runtime/parachains/src/mock.rs +++ b/runtime/parachains/src/mock.rs @@ -281,7 +281,7 @@ impl crate::disputes::SlashingHandler for Test { } fn initializer_initialize(_now: BlockNumber) -> Weight { - Weight::new() + Weight::zero() } fn initializer_finalize() {} diff --git a/runtime/westend/src/weights/runtime_parachains_disputes_slashing.rs b/runtime/westend/src/weights/runtime_parachains_disputes_slashing.rs index 6d5b3d6d2be9..679e827f0896 100644 --- a/runtime/westend/src/weights/runtime_parachains_disputes_slashing.rs +++ b/runtime/westend/src/weights/runtime_parachains_disputes_slashing.rs @@ -63,7 +63,7 @@ impl runtime_parachains::disputes::slashing::WeightInfo fn report_dispute_lost(n: u32, ) -> Weight { Weight::from_ref_time(97_366_000 as RefTimeWeight) // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(467_000 as RefTimeWeight).scalar_saturating_mul(n as RefTimeWeight)) + .saturating_add(Weight::from_ref_time(467_000 as RefTimeWeight).saturating_mul(n as RefTimeWeight)) .saturating_add(T::DbWeight::get().reads(14 as RefTimeWeight)) .saturating_add(T::DbWeight::get().writes(4 as RefTimeWeight)) }