fix merge

paritytech · Sep 1, 2022 · ad12bf2 · ad12bf2
1 parent 1d51e3e
commit ad12bf2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/parachains/runtimes/assets/statemine/src/weights/xcm/mod.rs b/parachains/runtimes/assets/statemine/src/weights/xcm/mod.rs
@@ -37,16 +37,16 @@ impl WeighMultiAssets for MultiAssetFilter {
 	fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight {
 		let weight = match self {
 			Self::Definite(assets) =>
-				weight.scalar_saturating_mul(assets.inner().into_iter().count() as u64),
-			Self::Wild(_) => weight.scalar_saturating_mul(MAX_ASSETS as u64),
+				weight.saturating_mul(assets.inner().into_iter().count() as u64),
+			Self::Wild(_) => weight.saturating_mul(MAX_ASSETS as u64),
 		};
 		weight.ref_time()
 	}
 }
 
 impl WeighMultiAssets for MultiAssets {
 	fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight {
-		weight.scalar_saturating_mul(self.inner().into_iter().count() as u64).ref_time()
+		weight.saturating_mul(self.inner().into_iter().count() as u64).ref_time()
 	}
 }
 

diff --git a/parachains/runtimes/assets/statemint/src/weights/xcm/mod.rs b/parachains/runtimes/assets/statemint/src/weights/xcm/mod.rs
@@ -37,16 +37,16 @@ impl WeighMultiAssets for MultiAssetFilter {
 	fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight {
 		let weight = match self {
 			Self::Definite(assets) =>
-				weight.scalar_saturating_mul(assets.inner().into_iter().count() as u64),
-			Self::Wild(_) => weight.scalar_saturating_mul(MAX_ASSETS as u64),
+				weight.saturating_mul(assets.inner().into_iter().count() as u64),
+			Self::Wild(_) => weight.saturating_mul(MAX_ASSETS as u64),
 		};
 		weight.ref_time()
 	}
 }
 
 impl WeighMultiAssets for MultiAssets {
 	fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight {
-		weight.scalar_saturating_mul(self.inner().into_iter().count() as u64).ref_time()
+		weight.saturating_mul(self.inner().into_iter().count() as u64).ref_time()
 	}
 }
 

diff --git a/parachains/runtimes/assets/westmint/src/weights/xcm/mod.rs b/parachains/runtimes/assets/westmint/src/weights/xcm/mod.rs
@@ -37,16 +37,16 @@ impl WeighMultiAssets for MultiAssetFilter {
 	fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight {
 		let weight = match self {
 			Self::Definite(assets) =>
-				weight.scalar_saturating_mul(assets.inner().into_iter().count() as u64),
-			Self::Wild(_) => weight.scalar_saturating_mul(MAX_ASSETS as u64),
+				weight.saturating_mul(assets.inner().into_iter().count() as u64),
+			Self::Wild(_) => weight.saturating_mul(MAX_ASSETS as u64),
 		};
 		weight.ref_time()
 	}
 }
 
 impl WeighMultiAssets for MultiAssets {
 	fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight {
-		weight.scalar_saturating_mul(self.inner().into_iter().count() as u64).ref_time()
+		weight.saturating_mul(self.inner().into_iter().count() as u64).ref_time()
 	}
 }