Skip to content

Commit 267370e

Browse files
committed
[WIP] refactor: secure and simplify /ledger and /volatile directories handling in DummyImmutablesDbBuilder
1 parent 3d0a0c1 commit 267370e

File tree

1 file changed

+22
-15
lines changed

1 file changed

+22
-15
lines changed

mithril-common/src/digesters/dummy_immutable_db_builder.rs

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ use std::{
66
path::{Path, PathBuf},
77
};
88

9+
const IMMUTABLE_DIR: &str = "immutable";
10+
const LEDGER_DIR: &str = "ledger";
11+
const VOLATILE_DIR: &str = "volatile";
12+
913
/// A [DummyImmutableDb] builder.
1014
pub struct DummyImmutablesDbBuilder {
1115
dir: PathBuf,
@@ -146,20 +150,20 @@ impl DummyImmutablesDbBuilder {
146150
));
147151
}
148152

149-
if !self.ledger_files_to_write.is_empty() {
150-
let ledger_dir = self.dir.parent().unwrap().join("ledger");
151-
std::fs::create_dir_all(&ledger_dir).unwrap();
152-
for filename in &self.ledger_files_to_write {
153-
write_dummy_file(self.ledger_file_size, &ledger_dir, filename);
154-
}
155-
};
156-
157-
if !self.volatile_files_to_write.is_empty() {
158-
let volatile_dir = self.dir.parent().unwrap().join("volatile");
159-
std::fs::create_dir_all(&volatile_dir).unwrap();
160-
for filename in &self.volatile_files_to_write {
161-
write_dummy_file(self.volatile_file_size, &volatile_dir, filename);
162-
}
153+
for filename in &self.ledger_files_to_write {
154+
write_dummy_file(
155+
self.ledger_file_size,
156+
&self.dir.parent().unwrap().join(LEDGER_DIR),
157+
filename,
158+
);
159+
}
160+
161+
for filename in &self.volatile_files_to_write {
162+
write_dummy_file(
163+
self.volatile_file_size,
164+
&self.dir.parent().unwrap().join(VOLATILE_DIR),
165+
filename,
166+
);
163167
}
164168

165169
DummyImmutableDb {
@@ -173,7 +177,10 @@ impl DummyImmutablesDbBuilder {
173177
}
174178

175179
fn get_test_dir(subdir_name: &str) -> PathBuf {
176-
TempDir::create(subdir_name, "immutable")
180+
TempDir::create(subdir_name, LEDGER_DIR);
181+
TempDir::create(subdir_name, VOLATILE_DIR);
182+
183+
TempDir::create(subdir_name, IMMUTABLE_DIR)
177184
}
178185
}
179186

0 commit comments

Comments
 (0)