whoops and small refactoring
This commit is contained in:
parent
4cc9a648ab
commit
4312623930
1 changed files with 5 additions and 13 deletions
|
@ -415,11 +415,6 @@ impl BlockStoreIterator {
|
||||||
ReadingDir::Pending(_) => unreachable!(),
|
ReadingDir::Pending(_) => unreachable!(),
|
||||||
};
|
};
|
||||||
|
|
||||||
if *pos >= subpaths.len() {
|
|
||||||
self.path.pop();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
let data_dir_ent = match subpaths.get(*pos) {
|
let data_dir_ent = match subpaths.get(*pos) {
|
||||||
None => {
|
None => {
|
||||||
self.path.pop();
|
self.path.pop();
|
||||||
|
@ -444,15 +439,12 @@ impl BlockStoreIterator {
|
||||||
let path = data_dir_ent.path();
|
let path = data_dir_ent.path();
|
||||||
self.path.push(ReadingDir::Pending(path));
|
self.path.push(ReadingDir::Pending(path));
|
||||||
} else if name.len() == 64 {
|
} else if name.len() == 64 {
|
||||||
let hash_bytes = if let Ok(h) = hex::decode(&name) {
|
if let Ok(h) = hex::decode(&name) {
|
||||||
h
|
|
||||||
} else {
|
|
||||||
continue;
|
|
||||||
};
|
|
||||||
let mut hash = [0u8; 32];
|
let mut hash = [0u8; 32];
|
||||||
hash.copy_from_slice(&hash_bytes[..]);
|
hash.copy_from_slice(&h);
|
||||||
return Ok(Some(hash.into()));
|
return Ok(Some(hash.into()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue