validator: flatten check matches

validation/src/check_mapfix.rs

@@ -21,10 +21,7 @@ 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{
-					// update the mapfix model status to submitted
-					Ok(map_info)=>self.api.action_mapfix_submitted(
 				submissions_api::types::ActionMapfixSubmittedRequest{
 					MapfixID:mapfix_id,
 					ModelVersion:version,
@@ -34,24 +31,20 @@ impl crate::message_handler::MessageHandler{
 				}
 			).await.map_err(Error::ApiActionMapfixCheck)?,
 			// update the mapfix model status to request changes
-					Err(report)=>self.api.action_mapfix_request_changes(
+			Ok(CheckReportAndVersion{status:Err(report),..})=>self.api.action_mapfix_request_changes(
 				submissions_api::types::ActionMapfixRequestChangesRequest{
 					MapfixID:mapfix_id,
 					ErrorMessage:report,
 				}
 			).await.map_err(Error::ApiActionMapfixCheck)?,
-				}
-			},
-			Err(e)=>{
 			// TODO: report the error
 			// update the mapfix model status to request changes
-				self.api.action_mapfix_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)?;
+			).await.map_err(Error::ApiActionMapfixCheck)?,
-			},
 		}
 
 		Ok(())

validation/src/check_submission.rs

@@ -21,10 +21,8 @@ impl crate::message_handler::MessageHandler{
 
 		// update the submission depending on the result
 		match check_result{
-			Ok(CheckReportAndVersion{status,version})=>{
-				match status{
 			// update the submission model status to submitted
-					Ok(map_info)=>self.api.action_submission_submitted(
+			Ok(CheckReportAndVersion{status:Ok(map_info),version})=>self.api.action_submission_submitted(
 				submissions_api::types::ActionSubmissionSubmittedRequest{
 					SubmissionID:submission_id,
 					ModelVersion:version,
@@ -34,24 +32,20 @@ impl crate::message_handler::MessageHandler{
 				}
 			).await.map_err(Error::ApiActionSubmissionCheck)?,
 			// update the submission model status to request changes
-					Err(report)=>self.api.action_submission_request_changes(
+			Ok(CheckReportAndVersion{status:Err(report),..})=>self.api.action_submission_request_changes(
 				submissions_api::types::ActionSubmissionRequestChangesRequest{
 					SubmissionID:submission_id,
 					ErrorMessage:report,
 				}
 			).await.map_err(Error::ApiActionSubmissionCheck)?,
-				}
-			},
-			Err(e)=>{
 			// TODO: report the error
 			// update the submission model status to request changes
-				self.api.action_submission_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)?;
+			).await.map_err(Error::ApiActionSubmissionCheck)?,
-			},
 		}
 
 		Ok(())