Skip to content

refactor(precompute-args): remove Option<String> fields and use empty strings #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 28, 2025
Merged

refactor(precompute-args): remove Option<String> fields and use empty strings #30

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d967867
refactor(precompute-args): remove Option<String> fields and use empty…
nabil-Tounarti Aug 19, 2025
efe2de3
refactor(pre-compute-app): enforce &str types for borrowed String fields
nabil-Tounarti Aug 20, 2025
3d79f82
fix: use expected_checksum variable for clarity in checksum comparison
nabil-Tounarti Aug 28, 2025
05ab647
Merge remote-tracking branch 'origin/main' into feature/precompute-ar…
nabil-Tounarti Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 21 additions & 27 deletions src/compute/pre_compute_app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ impl PreComputeAppTrait for PreComputeApp {
/// ```
fn download_encrypted_dataset(&self) -> Result<Vec<u8>, ReplicateStatusCause> {
let args = self.pre_compute_args.as_ref().unwrap();
let chain_task_id = self.chain_task_id.as_ref().unwrap();
let encrypted_dataset_url = args.encrypted_dataset_url.as_ref().unwrap();
let chain_task_id: &str = self.chain_task_id.as_ref().unwrap();
let encrypted_dataset_url: &str = &args.encrypted_dataset_url;

info!(
"Downloading encrypted dataset file [chainTaskId:{chain_task_id}, url:{encrypted_dataset_url}]",
Expand All @@ -189,13 +189,10 @@ impl PreComputeAppTrait for PreComputeApp {
.ok_or(ReplicateStatusCause::PreComputeDatasetDownloadFailed)?;

info!("Checking encrypted dataset checksum [chainTaskId:{chain_task_id}]");
let expected_checksum = args
.encrypted_dataset_checksum
.as_ref()
.ok_or(ReplicateStatusCause::PreComputeDatasetDownloadFailed)?;
let expected_checksum: &str = &args.encrypted_dataset_checksum;
let actual_checksum = sha256_from_bytes(&encrypted_content);

if actual_checksum != *expected_checksum {
if actual_checksum != args.encrypted_dataset_checksum {
error!(
"Invalid dataset checksum [chainTaskId:{chain_task_id}, expected:{expected_checksum}, actual:{actual_checksum}]"
);
Expand Down Expand Up @@ -231,13 +228,11 @@ impl PreComputeAppTrait for PreComputeApp {
/// let decrypted = app.decrypt_dataset(&encrypted)?;
/// ```
fn decrypt_dataset(&self, encrypted_content: &[u8]) -> Result<Vec<u8>, ReplicateStatusCause> {
let base64_key = self
let base64_key: &str = &self
.pre_compute_args
.as_ref()
.unwrap()
.encrypted_dataset_base64_key
.as_ref()
.unwrap();
.encrypted_dataset_base64_key;

let key = general_purpose::STANDARD
.decode(base64_key)
Expand Down Expand Up @@ -280,10 +275,10 @@ impl PreComputeAppTrait for PreComputeApp {
/// app.save_plain_dataset_file(&plain_data)?;
/// ```
fn save_plain_dataset_file(&self, plain_dataset: &[u8]) -> Result<(), ReplicateStatusCause> {
let chain_task_id = self.chain_task_id.as_ref().unwrap();
let chain_task_id: &str = self.chain_task_id.as_ref().unwrap();
let args = self.pre_compute_args.as_ref().unwrap();
let output_dir = &args.output_dir;
let plain_dataset_filename = args.plain_dataset_filename.as_ref().unwrap();
let output_dir: &str = &args.output_dir;
let plain_dataset_filename: &str = &args.plain_dataset_filename;

let mut path = PathBuf::from(output_dir);
path.push(plain_dataset_filename);
Expand Down Expand Up @@ -335,10 +330,10 @@ mod tests {
input_files: urls.into_iter().map(String::from).collect(),
output_dir: output_dir.to_string(),
is_dataset_required: true,
encrypted_dataset_url: Some(HTTP_DATASET_URL.to_string()),
encrypted_dataset_base64_key: Some(ENCRYPTED_DATASET_KEY.to_string()),
encrypted_dataset_checksum: Some(DATASET_CHECKSUM.to_string()),
plain_dataset_filename: Some(PLAIN_DATA_FILE.to_string()),
encrypted_dataset_url: HTTP_DATASET_URL.to_string(),
encrypted_dataset_base64_key: ENCRYPTED_DATASET_KEY.to_string(),
encrypted_dataset_checksum: DATASET_CHECKSUM.to_string(),
plain_dataset_filename: PLAIN_DATA_FILE.to_string(),
}),
}
}
Expand Down Expand Up @@ -501,7 +496,7 @@ mod tests {
fn download_encrypted_dataset_failure_with_invalid_dataset_url() {
let mut app = get_pre_compute_app(CHAIN_TASK_ID, vec![], "");
if let Some(args) = &mut app.pre_compute_args {
args.encrypted_dataset_url = Some("http://bad-url".to_string());
args.encrypted_dataset_url = "http://bad-url".to_string();
}
let actual_content = app.download_encrypted_dataset();
assert_eq!(
Expand All @@ -514,10 +509,9 @@ mod tests {
fn download_encrypted_dataset_success_with_valid_iexec_gateway() {
let mut app = get_pre_compute_app(CHAIN_TASK_ID, vec![], "");
if let Some(args) = &mut app.pre_compute_args {
args.encrypted_dataset_url = Some(IPFS_DATASET_URL.to_string());
args.encrypted_dataset_checksum = Some(
"0x323b1637c7999942fbebfe5d42fe15dbfe93737577663afa0181938d7ad4a2ac".to_string(),
)
args.encrypted_dataset_url = IPFS_DATASET_URL.to_string();
args.encrypted_dataset_checksum =
"0x323b1637c7999942fbebfe5d42fe15dbfe93737577663afa0181938d7ad4a2ac".to_string();
}
let actual_content = app.download_encrypted_dataset();
let expected_content = Ok("hello world !\n".as_bytes().to_vec());
Expand All @@ -528,7 +522,7 @@ mod tests {
fn download_encrypted_dataset_failure_with_invalid_gateway() {
let mut app = get_pre_compute_app(CHAIN_TASK_ID, vec![], "");
if let Some(args) = &mut app.pre_compute_args {
args.encrypted_dataset_url = Some("/ipfs/INVALID_IPFS_DATASET_URL".to_string());
args.encrypted_dataset_url = "/ipfs/INVALID_IPFS_DATASET_URL".to_string();
}
let actual_content = app.download_encrypted_dataset();
let expected_content = Err(ReplicateStatusCause::PreComputeDatasetDownloadFailed);
Expand All @@ -539,7 +533,7 @@ mod tests {
fn download_encrypted_dataset_failure_with_invalid_dataset_checksum() {
let mut app = get_pre_compute_app(CHAIN_TASK_ID, vec![], "");
if let Some(args) = &mut app.pre_compute_args {
args.encrypted_dataset_checksum = Some("invalid_dataset_checksum".to_string())
args.encrypted_dataset_checksum = "invalid_dataset_checksum".to_string()
}
let actual_content = app.download_encrypted_dataset();
let expected_content = Err(ReplicateStatusCause::PreComputeInvalidDatasetChecksum);
Expand All @@ -563,7 +557,7 @@ mod tests {
fn decrypt_dataset_failure_with_bad_key() {
let mut app = get_pre_compute_app(CHAIN_TASK_ID, vec![], "");
if let Some(args) = &mut app.pre_compute_args {
args.encrypted_dataset_base64_key = Some("bad_key".to_string());
args.encrypted_dataset_base64_key = "bad_key".to_string();
}
let encrypted_data = app.download_encrypted_dataset().unwrap();
let actual_plain_data = app.decrypt_dataset(&encrypted_data);
Expand Down Expand Up @@ -609,7 +603,7 @@ mod tests {

let mut app = get_pre_compute_app(CHAIN_TASK_ID, vec![], output_path);
if let Some(args) = &mut app.pre_compute_args {
args.plain_dataset_filename = Some("/some-folder-123/not-found".to_string());
args.plain_dataset_filename = "/some-folder-123/not-found".to_string();
}
let plain_dataset = "Some very useful data.".as_bytes().to_vec();
let saved_dataset = app.save_plain_dataset_file(&plain_dataset);
Expand Down
62 changes: 28 additions & 34 deletions src/compute/pre_compute_args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ pub struct PreComputeArgs {
pub output_dir: String,
// Dataset related fields
pub is_dataset_required: bool,
pub encrypted_dataset_url: Option<String>,
pub encrypted_dataset_base64_key: Option<String>,
pub encrypted_dataset_checksum: Option<String>,
pub plain_dataset_filename: Option<String>,
pub encrypted_dataset_url: String,
pub encrypted_dataset_base64_key: String,
pub encrypted_dataset_checksum: String,
pub plain_dataset_filename: String,
// Input files
pub input_files: Vec<String>,
}
Expand Down Expand Up @@ -64,28 +64,28 @@ impl PreComputeArgs {
.parse::<bool>()
.map_err(|_| ReplicateStatusCause::PreComputeIsDatasetRequiredMissing)?;

let mut encrypted_dataset_url = None;
let mut encrypted_dataset_base64_key = None;
let mut encrypted_dataset_checksum = None;
let mut plain_dataset_filename = None;
let mut encrypted_dataset_url = String::new();
let mut encrypted_dataset_base64_key = String::new();
let mut encrypted_dataset_checksum = String::new();
let mut plain_dataset_filename = String::new();

if is_dataset_required {
encrypted_dataset_url = Some(get_env_var_or_error(
encrypted_dataset_url = get_env_var_or_error(
TeeSessionEnvironmentVariable::IexecDatasetUrl,
ReplicateStatusCause::PreComputeDatasetUrlMissing,
)?);
encrypted_dataset_base64_key = Some(get_env_var_or_error(
)?;
encrypted_dataset_base64_key = get_env_var_or_error(
TeeSessionEnvironmentVariable::IexecDatasetKey,
ReplicateStatusCause::PreComputeDatasetKeyMissing,
)?);
encrypted_dataset_checksum = Some(get_env_var_or_error(
)?;
encrypted_dataset_checksum = get_env_var_or_error(
TeeSessionEnvironmentVariable::IexecDatasetChecksum,
ReplicateStatusCause::PreComputeDatasetChecksumMissing,
)?);
plain_dataset_filename = Some(get_env_var_or_error(
)?;
plain_dataset_filename = get_env_var_or_error(
TeeSessionEnvironmentVariable::IexecDatasetFilename,
ReplicateStatusCause::PreComputeDatasetFilenameMissing,
)?);
)?;
}

let input_files_nb_str = get_env_var_or_error(
Expand Down Expand Up @@ -178,10 +178,10 @@ mod tests {

assert_eq!(args.output_dir, OUTPUT_DIR);
assert!(!args.is_dataset_required);
assert_eq!(args.encrypted_dataset_url, None);
assert_eq!(args.encrypted_dataset_base64_key, None);
assert_eq!(args.encrypted_dataset_checksum, None);
assert_eq!(args.plain_dataset_filename, None);
assert_eq!(args.encrypted_dataset_url, "");
assert_eq!(args.encrypted_dataset_base64_key, "");
assert_eq!(args.encrypted_dataset_checksum, "");
assert_eq!(args.plain_dataset_filename, "");
assert_eq!(args.input_files.len(), 1);
assert_eq!(args.input_files[0], "https://input-1.txt");
});
Expand All @@ -202,19 +202,13 @@ mod tests {

assert_eq!(args.output_dir, OUTPUT_DIR);
assert!(args.is_dataset_required);
assert_eq!(args.encrypted_dataset_url, Some(DATASET_URL.to_string()));
assert_eq!(
args.encrypted_dataset_base64_key,
Some(DATASET_KEY.to_string())
);
assert_eq!(args.encrypted_dataset_url, DATASET_URL.to_string());
assert_eq!(args.encrypted_dataset_base64_key, DATASET_KEY.to_string());
assert_eq!(
args.encrypted_dataset_checksum,
Some(DATASET_CHECKSUM.to_string())
);
assert_eq!(
args.plain_dataset_filename,
Some(DATASET_FILENAME.to_string())
DATASET_CHECKSUM.to_string()
);
assert_eq!(args.plain_dataset_filename, DATASET_FILENAME.to_string());
assert_eq!(args.input_files.len(), 0);
});
}
Expand All @@ -235,10 +229,10 @@ mod tests {

assert_eq!(args.output_dir, OUTPUT_DIR);
assert!(!args.is_dataset_required);
assert_eq!(args.encrypted_dataset_url, None);
assert_eq!(args.encrypted_dataset_base64_key, None);
assert_eq!(args.encrypted_dataset_checksum, None);
assert_eq!(args.plain_dataset_filename, None);
assert_eq!(args.encrypted_dataset_url, "");
assert_eq!(args.encrypted_dataset_base64_key, "");
assert_eq!(args.encrypted_dataset_checksum, "");
assert_eq!(args.plain_dataset_filename, "");
assert_eq!(args.input_files.len(), 3);
assert_eq!(args.input_files[0], "https://input-1.txt");
assert_eq!(args.input_files[1], "https://input-2.txt");
Expand Down