validator: final rusty check

validation/src/check.rs

@@ -227,9 +227,9 @@ impl<ID:Copy+Eq+std::hash::Hash> AtLeastOneMatchingAndNoExtraCheckContext<ID>{
 }
 
 pub struct MapInfoOwned{
-	display_name:String,
+	pub display_name:String,
-	creator:String,
+	pub creator:String,
-	game_id:GameID,
+	pub game_id:GameID,
 }
 
 // crazy!

validation/src/check_mapfix.rs

@@ -1,4 +1,4 @@
-use crate::check::{CheckStatus,CheckReportAndVersion};
+use crate::check::CheckReportAndVersion;
 use crate::nats_types::CheckMapfixRequest;
 
 #[allow(dead_code)]
@@ -24,22 +24,22 @@ impl crate::message_handler::MessageHandler{
 			Ok(CheckReportAndVersion{status,version})=>{
 				match status{
 					// update the mapfix model status to submitted
-					CheckStatus::Passed{display_name,creator,game_id}=>
+					Ok(map_info)=>
 					self.api.action_mapfix_submitted(
 						submissions_api::types::ActionMapfixSubmittedRequest{
 							MapfixID:mapfix_id,
 							ModelVersion:version,
-							DisplayName:display_name,
+							DisplayName:map_info.display_name,
-							Creator:creator,
+							Creator:map_info.creator,
-							GameID:game_id as u32,
+							GameID:map_info.game_id as u32,
 						}
 					).await.map_err(Error::ApiActionMapfixCheck)?,
 					// update the mapfix model status to request changes
-					CheckStatus::Failed{report}=>
+					Err(report)=>
 					self.api.action_mapfix_request_changes(
 						submissions_api::types::ActionMapfixRequestChangesRequest{
 							MapfixID:mapfix_id,
-							ErrorMessage:report.to_string(),
+							ErrorMessage:report,
 						}
 					).await.map_err(Error::ApiActionMapfixCheck)?,
 				}

validation/src/check_submission.rs

@@ -1,4 +1,4 @@
-use crate::check::{CheckStatus,CheckReportAndVersion};
+use crate::check::CheckReportAndVersion;
 use crate::nats_types::CheckSubmissionRequest;
 
 #[allow(dead_code)]
@@ -24,22 +24,22 @@ impl crate::message_handler::MessageHandler{
 			Ok(CheckReportAndVersion{status,version})=>{
 				match status{
 					// update the submission model status to submitted
-					CheckStatus::Passed{display_name,creator,game_id}=>
+					Ok(map_info)=>
 					self.api.action_submission_submitted(
 						submissions_api::types::ActionSubmissionSubmittedRequest{
 							SubmissionID:submission_id,
 							ModelVersion:version,
-							DisplayName:display_name,
+							DisplayName:map_info.display_name,
-							Creator:creator,
+							Creator:map_info.creator,
-							GameID:game_id as u32,
+							GameID:map_info.game_id as u32,
 						}
 					).await.map_err(Error::ApiActionSubmissionCheck)?,
 					// update the submission model status to request changes
-					CheckStatus::Failed{report}=>
+					Err(report)=>
 					self.api.action_submission_request_changes(
 						submissions_api::types::ActionSubmissionRequestChangesRequest{
 							SubmissionID:submission_id,
-							ErrorMessage:report.to_string(),
+							ErrorMessage:report,
 						}
 					).await.map_err(Error::ApiActionSubmissionCheck)?,
 				}