chore: fix lint warnings and outdated tests (#475)
This commit is contained in:
parent
1fdf8dc01f
commit
de48c9df46
6 changed files with 33 additions and 23 deletions
|
|
@ -102,7 +102,10 @@ fn iterate_till_point(
|
|||
if block.hash().as_ref().eq(block_hash) && block.slot() == slot {
|
||||
Ok(iter)
|
||||
} else {
|
||||
Err(Error::CannotFindBlock(Point::Specific(slot, block_hash.to_vec())).into())
|
||||
Err(Error::CannotFindBlock(Point::Specific(
|
||||
slot,
|
||||
block_hash.to_vec(),
|
||||
)))
|
||||
}
|
||||
}
|
||||
Some(Err(_)) | None => Ok(iter),
|
||||
|
|
@ -231,7 +234,7 @@ pub fn read_blocks_from_point(
|
|||
if block.slot() == 0 && block.number() == 0 {
|
||||
Ok(Box::new(iter))
|
||||
} else {
|
||||
Err(Error::OriginMissing.into())
|
||||
Err(Error::OriginMissing)
|
||||
}
|
||||
}
|
||||
Some(Err(_)) | None => Ok(Box::new(iter)),
|
||||
|
|
|
|||
|
|
@ -45,9 +45,7 @@ pub struct Reader {
|
|||
impl Reader {
|
||||
fn read_version(inner: &mut BufReader<File>) -> Result<u8, Error> {
|
||||
let mut buf = [0u8; 1];
|
||||
inner
|
||||
.read_exact(&mut buf)
|
||||
.map_err(|e| Error::VersionMissing(e))?;
|
||||
inner.read_exact(&mut buf).map_err(Error::VersionMissing)?;
|
||||
let version = buf[0];
|
||||
|
||||
Ok(version)
|
||||
|
|
|
|||
|
|
@ -156,12 +156,15 @@ mod tests {
|
|||
}
|
||||
|
||||
#[test]
|
||||
fn can_parse_inconsistent_entries() {
|
||||
fn errors_on_inconsistent_entries() {
|
||||
let reader =
|
||||
super::read_entries(Path::new("../test_data/inconsistent_indexes"), "10366").unwrap();
|
||||
|
||||
for entry in reader {
|
||||
entry.unwrap();
|
||||
match entry {
|
||||
Ok(_) => continue,
|
||||
Err(x) => assert!(matches!(x, super::Error::InconsistentState)),
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue