New BlockDimensions interface

Akare123 · Jul 27, 2023 · 6959b22 · 6959b22
1 parent c11a4df
commit 6959b22
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/base/src/metrics/adapter.rs b/base/src/metrics/adapter.rs
@@ -51,8 +51,8 @@ impl Metrics for MetricAdapter {
 	fn block_dims_and_size(&self, block_dims: BlockDimensions, block_len: u32) {
 		#[rustfmt::skip]
 			may_observe!(
-				general, block_dims_rows, block_dims.rows.0,
-				general, block_dims_cols, block_dims.cols.0,
+				general, block_dims_rows, block_dims.rows().0,
+				general, block_dims_cols, block_dims.cols().0,
 				general, block_len, block_len
 			);
 	}
@@ -84,8 +84,8 @@ impl Metrics for RPCMetricAdapter {
 	fn block_dims_and_size(&self, block_dims: BlockDimensions, block_len: u32) {
 		#[rustfmt::skip]
 			may_observe!(
-				general, block_dims_rows, block_dims.rows.0,
-				general, block_dims_cols, block_dims.cols.0,
+				general, block_dims_rows, block_dims.rows().0,
+				general, block_dims_cols, block_dims.cols().0,
 				general, block_len, block_len
 			);
 	}

diff --git a/pallets/system/src/extensions/check_weight.rs b/pallets/system/src/extensions/check_weight.rs
@@ -109,8 +109,8 @@ where
 			dynamic_block_len.cols,
 			dynamic_block_len.chunk_size(),
 		)
-		.size()
-		.ok_or(InvalidTransaction::Custom(MaxPaddedLenExceeded as u8))?;
+		.ok_or(InvalidTransaction::Custom(MaxPaddedLenExceeded as u8))?
+		.size();
 
 		let max_padded_len = u32::try_from(max_padded_len)
 			.map_err(|_| InvalidTransaction::Custom(MaxPaddedLenExceeded as u8))?;

diff --git a/pallets/system/src/header_builder.rs b/pallets/system/src/header_builder.rs
@@ -139,8 +139,8 @@ pub fn build_extension<M: Metrics>(
 	.expect("Build commitments cannot fail .qed");
 	let app_lookup = DataLookup::from_id_and_len_iter(xts_layout.into_iter())
 		.expect("Extrinsic size cannot overflow .qed");
-	let rows = block_dims.rows.0.saturated_into::<u16>();
-	let cols = block_dims.cols.0.saturated_into::<u16>();
+	let rows = block_dims.rows().0.saturated_into::<u16>();
+	let cols = block_dims.cols().0.saturated_into::<u16>();
 
 	// **NOTE:** Header extension V2 is not yet enable by default.
 	if cfg!(feature = "header_extension_v2") {

diff --git a/rpc/kate-rpc/src/lib.rs b/rpc/kate-rpc/src/lib.rs
@@ -367,7 +367,8 @@ where
 			BlockLengthRows(dimensions.rows().get().into()),
 			BlockLengthColumns(dimensions.cols().get().into()),
 			BLOCK_CHUNK_SIZE,
-		);
+		)
+		.ok_or_else(|| internal_err!("Block dimensions are invalid"))?;
 
 		let kc_public_params_raw =
 			self.client