Move PrepareError to the error module

node/core/pvf/src/artifacts.rs

@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
+use crate::error::PrepareError;
 use always_assert::always;
 use async_std::path::{Path, PathBuf};
 use parity_scale_codec::{Decode, Encode};
@@ -23,18 +24,6 @@ use std::{
 	time::{Duration, SystemTime},
 };
 
-/// An error that occurred during the prepare part of the PVF pipeline.
-#[derive(Debug, Clone, Encode, Decode)]
-pub enum PrepareError {
-	/// During the prevalidation stage of preparation an issue was found with the PVF.
-	Prevalidation(String),
-	/// Compilation failed for the given PVF.
-	Preparation(String),
-	/// This state indicates that the process assigned to prepare the artifact wasn't responsible
-	/// or were killed. This state is reported by the validation host (not by the worker).
-	DidNotMakeIt,
-}
-
 /// A wrapper for the compiled PVF code.
 #[derive(Encode, Decode)]
 pub struct CompiledArtifact(Vec<u8>);

node/core/pvf/src/error.rs

@@ -14,7 +14,19 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::artifacts::PrepareError;
+use parity_scale_codec::{Decode, Encode};
+
+/// An error that occurred during the prepare part of the PVF pipeline.
+#[derive(Debug, Clone, Encode, Decode)]
+pub enum PrepareError {
+	/// During the prevalidation stage of preparation an issue was found with the PVF.
+	Prevalidation(String),
+	/// Compilation failed for the given PVF.
+	Preparation(String),
+	/// This state indicates that the process assigned to prepare the artifact wasn't responsible
+	/// or were killed. This state is reported by the validation host (not by the worker).
+	DidNotMakeIt,
+}
 
 /// A error raised during validation of the candidate.
 #[derive(Debug, Clone)]

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

@@ -16,7 +16,7 @@
 
 use super::worker::{self, Outcome};
 use crate::{
-	artifacts::PrepareError,
+	error::PrepareError,
 	metrics::Metrics,
 	worker_common::{IdleWorker, WorkerHandle},
 	LOG_TARGET,

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

@@ -18,9 +18,7 @@
 
 use super::pool::{self, Worker};
 use crate::{
-	artifacts::{ArtifactId, PrepareError},
-	metrics::Metrics,
-	Priority, Pvf, LOG_TARGET,
+	artifacts::ArtifactId, error::PrepareError, metrics::Metrics, Priority, Pvf, LOG_TARGET,
 };
 use always_assert::{always, never};
 use async_std::path::PathBuf;

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

@@ -15,7 +15,8 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::{
-	artifacts::{CompiledArtifact, PrepareError},
+	artifacts::CompiledArtifact,
+	error::PrepareError,
 	worker_common::{
 		bytes_to_path, framed_recv, framed_send, path_to_bytes, spawn_with_program_path,
 		tmpfile_in, worker_event_loop, IdleWorker, SpawnErr, WorkerHandle,