post-merge fixes

paritytech · Sep 1, 2022 · 655fe98 · 655fe98
1 parent c48aa45
commit 655fe98
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/runtime/parachains/src/disputes.rs b/runtime/parachains/src/disputes.rs
@@ -117,7 +117,7 @@ impl<BlockNumber> SlashingHandler<BlockNumber> 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
@@ -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<T: Config> Pallet<T> {
 	/// 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
@@ -281,7 +281,7 @@ impl crate::disputes::SlashingHandler<BlockNumber> 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
@@ -63,7 +63,7 @@ impl<T: frame_system::Config> 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))
 	}