Renames

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

frame/system/src/limits.rs

@@ -252,9 +252,9 @@ impl BlockWeights {
 				weights.max_extrinsic,
 				max_for_class.saturating_sub(base_for_class),
 			);
-			// Max extrinsic should have a value for each component.
+			// Max extrinsic must non be zero in any component.
 			error_assert!(
-				!weights.max_extrinsic.is_nothing(),
+				weights.max_extrinsic.all_gt(&Weight::zero()),
 				&mut error,
 				"[{:?}] {:?} (max_extrinsic) must not be 0. Check base cost and average initialization cost.",
 				class, weights.max_extrinsic,

frame/transaction-payment/src/lib.rs

@@ -196,10 +196,8 @@ where
 
 		let weights = T::BlockWeights::get();
 		// the computed ratio is only among the normal class.
-		let normal_max_weight = weights
-			.get(DispatchClass::Normal)
-			.max_total
-			.chromatic_limited_or(weights.max_block);
+		let normal_max_weight =
+			weights.get(DispatchClass::Normal).max_total.limited_or(weights.max_block);
 		let current_block_weight = <frame_system::Pallet<T>>::block_weight();
 		let normal_block_weight =
 			current_block_weight.get(DispatchClass::Normal).min(normal_max_weight);