refactor(rtc_data_service::data_upload): split DataUploadRequest from DataUploadMessage

Author: PiDelport

rtc_data_service/src/data_upload/message.rs

@@ -3,11 +3,15 @@ use rtc_types::{DataUploadError, DataUploadResponse, EcallError, UploadMetadata}
 
 use crate::data_enclave_actor::DataEnclaveActor;
 
-pub struct DataUploadMessage {
+pub struct DataUploadRequest {
     pub metadata: UploadMetadata,
     pub payload: Box<[u8]>,
 }
 
+pub struct DataUploadMessage {
+    pub request: DataUploadRequest,
+}
+
 impl Message for DataUploadMessage {
     type Result = Result<DataUploadResponse, EcallError<DataUploadError>>;
 }
@@ -17,6 +21,7 @@ impl Handler<DataUploadMessage> for DataEnclaveActor {
     type Result = <DataUploadMessage as Message>::Result;
 
     fn handle(&mut self, msg: DataUploadMessage, _ctx: &mut Self::Context) -> Self::Result {
-        self.get_enclave().upload_data(&msg.payload, msg.metadata)
+        self.get_enclave()
+            .upload_data(&msg.request.payload, msg.request.metadata)
     }
 }

rtc_data_service/src/data_upload/service.rs

@@ -6,8 +6,8 @@ use actix_web::{post, web};
 use models::*;
 use rtc_types::{DataUploadError, DataUploadResponse, EcallError};
 
-use super::DataUploadMessage;
 use crate::data_enclave_actor::DataEnclaveActor;
+use crate::data_upload::{DataUploadMessage, DataUploadRequest};
 use crate::merge_error::*;
 
 /// Save uploaded data file using a [`DataUploadMessage`] for [`DataEnclaveActor`].
@@ -22,7 +22,8 @@ pub async fn upload_file(
     req_body: web::Json<RequestBody>,
     enclave: web::Data<Addr<DataEnclaveActor>>,
 ) -> actix_web::Result<web::Json<ResponseBody>> {
-    let message: DataUploadMessage = req_body.0.try_into()?;
+    let request: DataUploadRequest = req_body.0.try_into()?;
+    let message = DataUploadMessage { request };
 
     let result: Result<DataUploadResponse, MergedError<EcallError<DataUploadError>, MailboxError>> =
         enclave.send(message).await.merge_err();
@@ -40,7 +41,7 @@ pub mod models {
     use rtc_types::{DataUploadResponse, UploadMetadata};
     use serde::{Deserialize, Serialize};
 
-    use crate::data_upload::DataUploadMessage;
+    use crate::data_upload::DataUploadRequest;
     use crate::validation::ValidationError;
     use crate::Base64Standard;
 
@@ -76,7 +77,7 @@ pub mod models {
         }
     }
 
-    impl TryFrom<RequestBody> for DataUploadMessage {
+    impl TryFrom<RequestBody> for DataUploadRequest {
         type Error = ValidationError;
 
         fn try_from(request_body: RequestBody) -> Result<Self, Self::Error> {
@@ -85,7 +86,7 @@ pub mod models {
             let nonce = TryFrom::try_from(request_body.metadata.nonce)
                 .or(Err(ValidationError::new("Invalid nonce")))?;
 
-            Ok(DataUploadMessage {
+            Ok(DataUploadRequest {
                 metadata: UploadMetadata {
                     uploader_pub_key,
                     nonce,