validator: rename errors

validation/src/message_handler.rs

@@ -5,10 +5,10 @@ pub enum HandleMessageError{
 	DoubleAck(async_nats::Error),
 	Json(serde_json::Error),
 	UnknownSubject(String),
-	UploadMapfix(crate::upload_mapfix::UploadError),
-	UploadSubmission(crate::upload_submission::UploadError),
-	ValidateMapfix(crate::validate_mapfix::ValidateMapfixError),
-	ValidateSubmission(crate::validate_submission::ValidateSubmissionError),
+	UploadMapfix(crate::upload_mapfix::Error),
+	UploadSubmission(crate::upload_submission::Error),
+	ValidateMapfix(crate::validate_mapfix::Error),
+	ValidateSubmission(crate::validate_submission::Error),
 }
 impl std::fmt::Display for HandleMessageError{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{

validation/src/upload_mapfix.rs

@@ -2,26 +2,26 @@ use crate::nats_types::UploadMapfixRequest;
 
 #[allow(dead_code)]
 #[derive(Debug)]
-pub enum UploadError{
+pub enum Error{
 	Get(rbx_asset::cookie::GetError),
 	Json(serde_json::Error),
 	Upload(rbx_asset::cookie::UploadError),
 	ApiActionMapfixUploaded(submissions_api::Error),
 }
-impl std::fmt::Display for UploadError{
+impl std::fmt::Display for Error{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
 		write!(f,"{self:?}")
 	}
 }
-impl std::error::Error for UploadError{}
+impl std::error::Error for Error{}
 
 impl crate::message_handler::MessageHandler{
-	pub async fn upload_mapfix(&self,upload_info:UploadMapfixRequest)->Result<(),UploadError>{
+	pub async fn upload_mapfix(&self,upload_info:UploadMapfixRequest)->Result<(),Error>{
 		// download the map model version
 		let model_data=self.cookie_context.get_asset(rbx_asset::cookie::GetAssetRequest{
 			asset_id:upload_info.ModelID,
 			version:Some(upload_info.ModelVersion),
-		}).await.map_err(UploadError::Get)?;
+		}).await.map_err(Error::Get)?;
 
 		// upload the map to the strafesnet group
 		let _upload_response=self.cookie_context.upload(rbx_asset::cookie::UploadRequest{
@@ -31,14 +31,14 @@ impl crate::message_handler::MessageHandler{
 			description:None,
 			ispublic:None,
 			allowComments:None,
-		},model_data).await.map_err(UploadError::Upload)?;
+		},model_data).await.map_err(Error::Upload)?;
 
 		// that's it, the database entry does not need to be changed.
 
 		// mark mapfix as uploaded, TargetAssetID is unchanged
 		self.api.action_mapfix_uploaded(submissions_api::types::ActionMapfixUploadedRequest{
 			MapfixID:upload_info.MapfixID,
-		}).await.map_err(UploadError::ApiActionMapfixUploaded)?;
+		}).await.map_err(Error::ApiActionMapfixUploaded)?;
 
 		Ok(())
 	}

validation/src/upload_submission.rs

@@ -2,27 +2,27 @@ use crate::nats_types::UploadSubmissionRequest;
 
 #[allow(dead_code)]
 #[derive(Debug)]
-pub enum UploadError{
+pub enum Error{
 	Get(rbx_asset::cookie::GetError),
 	Json(serde_json::Error),
 	Create(rbx_asset::cookie::CreateError),
 	SystemTime(std::time::SystemTimeError),
 	ApiActionSubmissionUploaded(submissions_api::Error),
 }
-impl std::fmt::Display for UploadError{
+impl std::fmt::Display for Error{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
 		write!(f,"{self:?}")
 	}
 }
-impl std::error::Error for UploadError{}
+impl std::error::Error for Error{}
 
 impl crate::message_handler::MessageHandler{
-	pub async fn upload_submission(&self,upload_info:UploadSubmissionRequest)->Result<(),UploadError>{
+	pub async fn upload_submission(&self,upload_info:UploadSubmissionRequest)->Result<(),Error>{
 		// download the map model version
 		let model_data=self.cookie_context.get_asset(rbx_asset::cookie::GetAssetRequest{
 			asset_id:upload_info.ModelID,
 			version:Some(upload_info.ModelVersion),
-		}).await.map_err(UploadError::Get)?;
+		}).await.map_err(Error::Get)?;
 
 		// upload the map to the strafesnet group
 		let upload_response=self.cookie_context.create(rbx_asset::cookie::CreateRequest{
@@ -31,13 +31,13 @@ impl crate::message_handler::MessageHandler{
 			ispublic:false,
 			allowComments:false,
 			groupId:self.group_id,
-		},model_data).await.map_err(UploadError::Create)?;
+		},model_data).await.map_err(Error::Create)?;
 
 		// note the asset id of the created model for later release, and mark the submission as uploaded
 		self.api.action_submission_uploaded(submissions_api::types::ActionSubmissionUploadedRequest{
 			SubmissionID:upload_info.SubmissionID,
 			UploadedAssetID:upload_response.AssetId,
-		}).await.map_err(UploadError::ApiActionSubmissionUploaded)?;
+		}).await.map_err(Error::ApiActionSubmissionUploaded)?;
 
 		Ok(())
 	}

validation/src/validate_mapfix.rs

@@ -2,18 +2,18 @@ use crate::nats_types::ValidateMapfixRequest;
 
 #[allow(dead_code)]
 #[derive(Debug)]
-pub enum ValidateMapfixError{
+pub enum Error{
 	ApiActionMapfixValidate(submissions_api::Error),
 }
-impl std::fmt::Display for ValidateMapfixError{
+impl std::fmt::Display for Error{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
 		write!(f,"{self:?}")
 	}
 }
-impl std::error::Error for ValidateMapfixError{}
+impl std::error::Error for Error{}
 
 impl crate::message_handler::MessageHandler{
-	pub async fn validate_mapfix(&self,validate_info:ValidateMapfixRequest)->Result<(),ValidateMapfixError>{
+	pub async fn validate_mapfix(&self,validate_info:ValidateMapfixRequest)->Result<(),Error>{
 		let mapfix_id=validate_info.MapfixID;
 		let validate_result=self.validate_inner(validate_info.into()).await;
 
@@ -23,14 +23,14 @@ impl crate::message_handler::MessageHandler{
 				// update the mapfix model status to validated
 				self.api.action_mapfix_validated(
 					submissions_api::types::MapfixID(mapfix_id)
-				).await.map_err(ValidateMapfixError::ApiActionMapfixValidate)?;
+				).await.map_err(Error::ApiActionMapfixValidate)?;
 			},
 			Err(e)=>{
 				// update the mapfix model status to accepted
 				self.api.action_mapfix_accepted(submissions_api::types::ActionMapfixAcceptedRequest{
 					MapfixID:mapfix_id,
 					StatusMessage:format!("{e}"),
-				}).await.map_err(ValidateMapfixError::ApiActionMapfixValidate)?;
+				}).await.map_err(Error::ApiActionMapfixValidate)?;
 			},
 		}
 

validation/src/validate_submission.rs

@@ -2,18 +2,18 @@ use crate::nats_types::ValidateSubmissionRequest;
 
 #[allow(dead_code)]
 #[derive(Debug)]
-pub enum ValidateSubmissionError{
+pub enum Error{
 	ApiActionSubmissionValidate(submissions_api::Error),
 }
-impl std::fmt::Display for ValidateSubmissionError{
+impl std::fmt::Display for Error{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
 		write!(f,"{self:?}")
 	}
 }
-impl std::error::Error for ValidateSubmissionError{}
+impl std::error::Error for Error{}
 
 impl crate::message_handler::MessageHandler{
-	pub async fn validate_submission(&self,validate_info:ValidateSubmissionRequest)->Result<(),ValidateSubmissionError>{
+	pub async fn validate_submission(&self,validate_info:ValidateSubmissionRequest)->Result<(),Error>{
 		let submission_id=validate_info.SubmissionID;
 		let validate_result=self.validate_inner(validate_info.into()).await;
 
@@ -23,14 +23,14 @@ impl crate::message_handler::MessageHandler{
 				// update the submission model status to validated
 				self.api.action_submission_validated(
 					submissions_api::types::SubmissionID(submission_id)
-				).await.map_err(ValidateSubmissionError::ApiActionSubmissionValidate)?;
+				).await.map_err(Error::ApiActionSubmissionValidate)?;
 			},
 			Err(e)=>{
 				// update the submission model status to accepted
 				self.api.action_submission_accepted(submissions_api::types::ActionSubmissionAcceptedRequest{
 					SubmissionID:submission_id,
 					StatusMessage:format!("{e}"),
-				}).await.map_err(ValidateSubmissionError::ApiActionSubmissionValidate)?;
+				}).await.map_err(Error::ApiActionSubmissionValidate)?;
 			},
 		}