Merge remote-tracking branch 'origin/master' into slumber-pvf-host-pr…

…echecking-2

node/core/pvf/src/host.rs

@@ -581,6 +581,7 @@ async fn handle_prepare_done(
 			return Ok(())
 		},
 		Some(state @ ArtifactState::Preparing { waiting_for_response: _ }) => state,
+
 	};
 
 	if let ArtifactState::Preparing { waiting_for_response } = state {

node/core/pvf/src/prepare/pool.rs

@@ -80,10 +80,10 @@ pub enum FromPool {
 	Spawned(Worker),
 
 	/// The given worker either succeeded or failed the given job.
-	/// The artifact file has only been written if the preparation was successful.
-	/// The `bool` says whether the worker ripped.
 	Concluded {
+		/// A key for retrieving the worker data from the pool.
 		worker: Worker,
+		/// Indicates whether the worker process was killed.
 		rip: bool,
 		/// [`Ok`] indicates that compiled artifact is successfully stored on disk.
 		/// Otherwise, an [error](PrepareError) is supplied.

node/core/pvf/src/prepare/queue.rs

@@ -532,6 +532,7 @@ mod tests {
 	use futures::{future::BoxFuture, FutureExt};
 	use slotmap::SlotMap;
 	use std::task::Poll;
+	use crate::error::PrepareError;
 
 	/// Creates a new PVF which artifact id can be uniquely identified by the given number.
 	fn pvf(descriminator: u32) -> Pvf {
@@ -774,7 +775,11 @@ mod tests {
 
 		assert_matches!(test.poll_and_recv_to_pool().await, pool::ToPool::StartWork { .. });
 
-		test.send_from_pool(pool::FromPool::Concluded { worker: w1, rip: true, result: Ok(()) });
+		test.send_from_pool(pool::FromPool::Concluded {
+			worker: w1,
+			rip: true,
+			result: Err(PrepareError::DidNotMakeIt),
+		});
 		test.poll_ensure_to_pool_is_empty().await;
 	}