Skip to content

[integritee-service] fix clean-reset flag #1347

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
clangenb merged 2 commits into from
Jun 7, 2023
Merged

[integritee-service] fix clean-reset flag #1347

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c3fa60
[integritee-service] fix clean-reset flag
clangenb Jun 6, 2023
0c3141b
Merge branch 'master' into cl/fix-clean-reset-flag
clangenb Jun 6, 2023
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
19 changes: 2 additions & 17 deletions service/src/setup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ fn purge_files(root_directory: &Path) -> ServiceResult<()> {
remove_dir_if_it_exists(root_directory, SHARDS_PATH)?;
remove_dir_if_it_exists(root_directory, SIDECHAIN_STORAGE_PATH)?;

remove_file_if_it_exists(root_directory, LIGHT_CLIENT_DB_PATH)?;
remove_file_if_it_exists(root_directory, light_client_backup_file().as_str())?;
remove_dir_if_it_exists(root_directory, LIGHT_CLIENT_DB_PATH)?;

Ok(())
}
Expand All @@ -109,18 +108,6 @@ fn remove_dir_if_it_exists(root_directory: &Path, dir_name: &str) -> ServiceResu
Ok(())
}

fn remove_file_if_it_exists(root_directory: &Path, file_name: &str) -> ServiceResult<()> {
let file = root_directory.join(file_name);
if file.exists() {
fs::remove_file(file).map_err(|e| Error::Custom(e.into()))?;
}
Ok(())
}

fn light_client_backup_file() -> String {
format!("{}.1", LIGHT_CLIENT_DB_PATH)
}

#[cfg(test)]
mod tests {
use super::*;
Expand All @@ -144,15 +131,13 @@ mod tests {
fs::File::create(&sidechain_db_path.join("sidechain_db_2.bin")).unwrap();
fs::File::create(&sidechain_db_path.join("sidechain_db_3.bin")).unwrap();

fs::File::create(&root_directory.join(LIGHT_CLIENT_DB_PATH)).unwrap();
fs::File::create(&root_directory.join(light_client_backup_file())).unwrap();
fs::create_dir_all(&root_directory.join(LIGHT_CLIENT_DB_PATH)).unwrap();

purge_files(&root_directory).unwrap();

assert!(!shards_path.exists());
assert!(!sidechain_db_path.exists());
assert!(!root_directory.join(LIGHT_CLIENT_DB_PATH).exists());
assert!(!root_directory.join(light_client_backup_file()).exists());
}

#[test]
Expand Down