validator: flatten check matches

validation/src/check_mapfix.rs

@@ -21,37 +21,30 @@ impl crate::message_handler::MessageHandler{
 
 		// update the mapfix depending on the result
 		match check_result{
-			Ok(CheckReportAndVersion{status,version})=>{
+			Ok(CheckReportAndVersion{status:Ok(map_info),version})=>self.api.action_mapfix_submitted(
-				match status{
+				submissions_api::types::ActionMapfixSubmittedRequest{
-					// update the mapfix model status to submitted
+					MapfixID:mapfix_id,
-					Ok(map_info)=>self.api.action_mapfix_submitted(
+					ModelVersion:version,
-						submissions_api::types::ActionMapfixSubmittedRequest{
+					DisplayName:map_info.display_name,
-							MapfixID:mapfix_id,
+					Creator:map_info.creator,
-							ModelVersion:version,
+					GameID:map_info.game_id as u32,
-							DisplayName:map_info.display_name,
-							Creator:map_info.creator,
-							GameID:map_info.game_id as u32,
-						}
-					).await.map_err(Error::ApiActionMapfixCheck)?,
-					// update the mapfix model status to request changes
-					Err(report)=>self.api.action_mapfix_request_changes(
-						submissions_api::types::ActionMapfixRequestChangesRequest{
-							MapfixID:mapfix_id,
-							ErrorMessage:report,
-						}
-					).await.map_err(Error::ApiActionMapfixCheck)?,
 				}
-			},
+			).await.map_err(Error::ApiActionMapfixCheck)?,
-			Err(e)=>{
+			// update the mapfix model status to request changes
-				// TODO: report the error
+			Ok(CheckReportAndVersion{status:Err(report),..})=>self.api.action_mapfix_request_changes(
-				// update the mapfix model status to request changes
+				submissions_api::types::ActionMapfixRequestChangesRequest{
-				self.api.action_mapfix_request_changes(
+					MapfixID:mapfix_id,
-					submissions_api::types::ActionMapfixRequestChangesRequest{
+					ErrorMessage:report,
-						MapfixID:mapfix_id,
+				}
-						ErrorMessage:e.to_string(),
+			).await.map_err(Error::ApiActionMapfixCheck)?,
-					}
+			// TODO: report the error
-				).await.map_err(Error::ApiActionMapfixCheck)?;
+			// update the mapfix model status to request changes
-			},
+			Err(e)=>self.api.action_mapfix_request_changes(
+				submissions_api::types::ActionMapfixRequestChangesRequest{
+					MapfixID:mapfix_id,
+					ErrorMessage:e.to_string(),
+				}
+			).await.map_err(Error::ApiActionMapfixCheck)?,
 		}
 
 		Ok(())

validation/src/check_submission.rs

@@ -21,37 +21,31 @@ impl crate::message_handler::MessageHandler{
 
 		// update the submission depending on the result
 		match check_result{
-			Ok(CheckReportAndVersion{status,version})=>{
+			// update the submission model status to submitted
-				match status{
+			Ok(CheckReportAndVersion{status:Ok(map_info),version})=>self.api.action_submission_submitted(
-					// update the submission model status to submitted
+				submissions_api::types::ActionSubmissionSubmittedRequest{
-					Ok(map_info)=>self.api.action_submission_submitted(
+					SubmissionID:submission_id,
-						submissions_api::types::ActionSubmissionSubmittedRequest{
+					ModelVersion:version,
-							SubmissionID:submission_id,
+					DisplayName:map_info.display_name,
-							ModelVersion:version,
+					Creator:map_info.creator,
-							DisplayName:map_info.display_name,
+					GameID:map_info.game_id as u32,
-							Creator:map_info.creator,
-							GameID:map_info.game_id as u32,
-						}
-					).await.map_err(Error::ApiActionSubmissionCheck)?,
-					// update the submission model status to request changes
-					Err(report)=>self.api.action_submission_request_changes(
-						submissions_api::types::ActionSubmissionRequestChangesRequest{
-							SubmissionID:submission_id,
-							ErrorMessage:report,
-						}
-					).await.map_err(Error::ApiActionSubmissionCheck)?,
 				}
-			},
+			).await.map_err(Error::ApiActionSubmissionCheck)?,
-			Err(e)=>{
+			// update the submission model status to request changes
-				// TODO: report the error
+			Ok(CheckReportAndVersion{status:Err(report),..})=>self.api.action_submission_request_changes(
-				// update the submission model status to request changes
+				submissions_api::types::ActionSubmissionRequestChangesRequest{
-				self.api.action_submission_request_changes(
+					SubmissionID:submission_id,
-					submissions_api::types::ActionSubmissionRequestChangesRequest{
+					ErrorMessage:report,
-						SubmissionID:submission_id,
+				}
-						ErrorMessage:e.to_string(),
+			).await.map_err(Error::ApiActionSubmissionCheck)?,
-					}
+			// TODO: report the error
-				).await.map_err(Error::ApiActionSubmissionCheck)?;
+			// update the submission model status to request changes
-			},
+			Err(e)=>self.api.action_submission_request_changes(
+				submissions_api::types::ActionSubmissionRequestChangesRequest{
+					SubmissionID:submission_id,
+					ErrorMessage:e.to_string(),
+				}
+			).await.map_err(Error::ApiActionSubmissionCheck)?,
 		}
 
 		Ok(())