PR suggestions

client/consensus/slots/Cargo.toml

@@ -14,6 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+async-std = "1.11.0"
 async-trait = "0.1.57"
 codec = { package = "parity-scale-codec", version = "3.0.0" }
 futures = "0.3.21"

client/consensus/slots/src/lib.rs

@@ -31,8 +31,8 @@ mod slots;
 pub use aux_schema::{check_equivocation, MAX_SLOT_CAPACITY, PRUNING_BOUND};
 pub use slots::SlotInfo;
 use slots::Slots;
-use std::time::Instant;
 
+use async_std::prelude::FutureExt;
 use futures::{future::Either, Future, TryFutureExt};
 use futures_timer::Delay;
 use log::{debug, info, warn};
@@ -251,29 +251,36 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		slot_info: &SlotInfo<B>,
 		logging_target: &str,
 	) -> Option<sp_inherents::InherentData> {
-		let inherent_data = match slot_info.create_inherent_data.create_inherent_data().await {
-			Ok(data) => data,
-			Err(err) => {
+		let inherent_data = match slot_info
+			.create_inherent_data
+			.create_inherent_data()
+			.timeout(slot_info.duration)
+			.await
+		{
+			Ok(Ok(data)) => data,
+			Ok(Err(err)) => {
 				warn!(
 					target: logging_target,
 					"Unable to create inherent data for block {:?}: {}",
 					slot_info.chain_head.hash(),
 					err,
 				);
+
 				return None
 			},
-		};
 
-		if Instant::now() > slot_info.ends_at {
-			warn!(
-				target: "slots",
-				"Creating inherent data took more time than we had left for slot {} for block {:?}.",
-				slot_info.slot,
-				slot_info.chain_head.hash(),
-			);
+			Err(err) => {
+				warn!(
+					target: logging_target,
+					"Creating inherent data for slot {} for block {:?} timed out: {}.",
+					slot_info.slot,
+					slot_info.chain_head.hash(),
+					err,
+				);
 
-			return None
-		}
+				return None
+			},
+		};
 
 		Some(inherent_data)
 	}

client/consensus/slots/src/slots.rs

@@ -70,14 +70,14 @@ impl<B: BlockT> SlotInfo<B> {
 	/// `ends_at` is calculated using `timestamp` and `duration`.
 	pub fn new(
 		slot: Slot,
-		inherent_data: Box<dyn InherentDataProvider>,
+		create_inherent_data: Box<dyn InherentDataProvider>,
 		duration: Duration,
 		chain_head: B::Header,
 		block_size_limit: Option<usize>,
 	) -> Self {
 		Self {
 			slot,
-			create_inherent_data: inherent_data,
+			create_inherent_data,
 			duration,
 			chain_head,
 			block_size_limit,