fix inherent data tests

client/basic-authorship-ver/src/basic_authorship.rs

@@ -369,13 +369,6 @@ where
 		let (tx, rx) = oneshot::channel();
 		let spawn_handle = self.spawn_handle.clone();
 
-		if let Ok(None) = inherent_data
-			.get_data::<sp_core::ShufflingSeed>(&sp_ver::RANDOM_SEED_INHERENT_IDENTIFIER)
-		{
-			sp_ver::RandomSeedInherentDataProvider(Default::default())
-				.provide_inherent_data(&mut inherent_data);
-		}
-
 		spawn_handle.spawn_blocking(
 			"basic-authorship-proposer",
 			None,
@@ -425,10 +418,19 @@ where
 	) -> Result<Proposal<Block, backend::TransactionFor<B, Block>, PR::Proof>, sp_blockchain::Error>
 	{
 		let propose_with_start = time::Instant::now();
+		let mut inherent_data = inherent_data.clone();
 
 		let mut block_builder =
 			self.client.new_block_at(&self.parent_id, inherent_digests, PR::ENABLED)?;
 
+
+		if let Ok(None) = inherent_data
+			.get_data::<sp_core::ShufflingSeed>(&sp_ver::RANDOM_SEED_INHERENT_IDENTIFIER)
+		{
+			sp_ver::RandomSeedInherentDataProvider(Default::default())
+				.provide_inherent_data(&mut inherent_data).await.unwrap();
+		}
+
 		let create_inherents_start = time::Instant::now();
 		let (seed, inherents) = block_builder.create_inherents(inherent_data.clone())?;
 		let create_inherents_end = time::Instant::now();
@@ -789,6 +791,7 @@ mod tests {
 
 		// when
 		let deadline = time::Duration::from_secs(3);
+
 		let block =
 			block_on(proposer.propose(Default::default(), Default::default(), deadline, None))
 				.map(|r| r.block)

client/consensus/slots/src/lib.rs

@@ -392,7 +392,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		let claim = self.claim_slot(&slot_info.chain_head, slot, &aux_data).await?;
 
 		let key = self.get_key(&claim);
-		inject_inherents(keystore, &key, &mut slot_info).await.ok();
+		inject_inherents(keystore, &key, &mut slot_info).await.ok()?;
 
 		if self.should_backoff(slot, &slot_info.chain_head) {
 			return None