grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ethstore: retry deduplication of wallet file names until success (#8910)

Browse Source
This commit is contained in:
André Silva 2018-06-20 10:30:41 +01:00 committed by Wei Tang
parent 08e46432c5
commit cf5ae81ced
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ethstore/src/accounts_dir/disk.rs
View File

@ -182,9 +182,22 @@ impl<T> DiskDirectory<T> where T: KeyFileManager {
// check for duplicate filename and append random suffix // check for duplicate filename and append random suffix
if dedup && keyfile_path.exists() { if dedup && keyfile_path.exists() {
let suffix = ::random::random_string(4); const MAX_RETRIES: usize = 500;
filename.push_str(&format!("-{}", suffix)); let mut retries = 0;
keyfile_path.set_file_name(&filename); let mut deduped_filename = filename.clone();
while keyfile_path.exists() {
if retries >= MAX_RETRIES {
return Err(Error::Custom(format!("Exceeded maximum retries when deduplicating account filename.")));
}
let suffix = ::random::random_string(4);
deduped_filename = format!("{}-{}", filename, suffix);
keyfile_path.set_file_name(&deduped_filename);
retries += 1;
}
filename = deduped_filename;
} }
// update account filename // update account filename