relax input conditions of fixed::checked_from_integer

frame/transaction-payment/src/lib.rs

@@ -348,7 +348,7 @@ pub mod pallet {
 			// loss.
 			assert!(
 				<Multiplier as sp_runtime::traits::Bounded>::max_value() >=
-					Multiplier::checked_from_integer(
+					Multiplier::checked_from_integer::<u128>(
 						T::BlockWeights::get().max_block.try_into().unwrap()
 					)
 					.unwrap(),

primitives/arithmetic/src/fixed_point.rs

@@ -121,7 +121,8 @@ pub trait FixedPointNumber:
 	/// Creates `self` from an integer number `int`.
 	///
 	/// Returns `None` if `int` exceeds accuracy.
-	fn checked_from_integer(int: Self::Inner) -> Option<Self> {
+	fn checked_from_integer<N: Into<Self::Inner>>(int: N) -> Option<Self> {
+		let int: Self::Inner = int.into();
 		int.checked_mul(&Self::DIV).map(Self::from_inner)
 	}
 
@@ -898,31 +899,32 @@ macro_rules! implement_fixed {
 				let accuracy = $name::accuracy();
 
 				// Case where integer fits.
-				let a = $name::checked_from_integer(42).expect("42 * accuracy <= inner_max; qed");
+				let a = $name::checked_from_integer::<$inner_type>(42)
+					.expect("42 * accuracy <= inner_max; qed");
 				assert_eq!(a.into_inner(), 42 * accuracy);
 
 				// Max integer that fit.
-				let a = $name::checked_from_integer(inner_max / accuracy)
+				let a = $name::checked_from_integer::<$inner_type>(inner_max / accuracy)
 					.expect("(inner_max / accuracy) * accuracy <= inner_max; qed");
 				assert_eq!(a.into_inner(), (inner_max / accuracy) * accuracy);
 
 				// Case where integer doesn't fit, so it returns `None`.
-				let a = $name::checked_from_integer(inner_max / accuracy + 1);
+				let a = $name::checked_from_integer::<$inner_type>(inner_max / accuracy + 1);
 				assert_eq!(a, None);
 
 				if $name::SIGNED {
 					// Case where integer fits.
-					let a = $name::checked_from_integer(0.saturating_sub(42))
+					let a = $name::checked_from_integer::<$inner_type>(0.saturating_sub(42))
 						.expect("-42 * accuracy >= inner_min; qed");
 					assert_eq!(a.into_inner(), 0 - 42 * accuracy);
 
 					// Min integer that fit.
-					let a = $name::checked_from_integer(inner_min / accuracy)
+					let a = $name::checked_from_integer::<$inner_type>(inner_min / accuracy)
 						.expect("(inner_min / accuracy) * accuracy <= inner_min; qed");
 					assert_eq!(a.into_inner(), (inner_min / accuracy) * accuracy);
 
 					// Case where integer doesn't fit, so it returns `None`.
-					let a = $name::checked_from_integer(inner_min / accuracy - 1);
+					let a = $name::checked_from_integer::<$inner_type>(inner_min / accuracy - 1);
 					assert_eq!(a, None);
 				}
 			}