Add Hash to beacon_block_store errors

This commit is contained in:
Paul Hauner 2019-01-23 09:32:32 +11:00
parent bf2cd2331d
commit 1fabc7e0ab
No known key found for this signature in database
GPG Key ID: D362883A9218FCC6

View File

@ -6,8 +6,8 @@ use types::{readers::BeaconBlockReader, BeaconBlock, Hash256};
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq)]
pub enum BeaconBlockAtSlotError { pub enum BeaconBlockAtSlotError {
UnknownBeaconBlock, UnknownBeaconBlock(Hash256),
InvalidBeaconBlock, InvalidBeaconBlock(Hash256),
DBError(String), DBError(String),
} }
@ -73,7 +73,7 @@ impl<T: ClientDB> BeaconBlockStore<T> {
current_hash = block_reader.parent_root(); current_hash = block_reader.parent_root();
} }
} else { } else {
break Err(BeaconBlockAtSlotError::UnknownBeaconBlock); break Err(BeaconBlockAtSlotError::UnknownBeaconBlock(current_hash));
} }
} }
} }
@ -145,7 +145,7 @@ mod tests {
db.put(DB_COLUMN, hash, ssz).unwrap(); db.put(DB_COLUMN, hash, ssz).unwrap();
assert_eq!( assert_eq!(
store.block_at_slot(other_hash, 42), store.block_at_slot(other_hash, 42),
Err(BeaconBlockAtSlotError::UnknownBeaconBlock) Err(BeaconBlockAtSlotError::UnknownBeaconBlock(*other_hash))
); );
} }
@ -243,7 +243,11 @@ mod tests {
let ssz = bs.block_at_slot(&hashes[4], 6).unwrap(); let ssz = bs.block_at_slot(&hashes[4], 6).unwrap();
assert_eq!(ssz, None); assert_eq!(ssz, None);
let ssz = bs.block_at_slot(&Hash256::from("unknown".as_bytes()), 2); let bad_hash = &Hash256::from("unknown".as_bytes());
assert_eq!(ssz, Err(BeaconBlockAtSlotError::UnknownBeaconBlock)); let ssz = bs.block_at_slot(bad_hash, 2);
assert_eq!(
ssz,
Err(BeaconBlockAtSlotError::UnknownBeaconBlock(*bad_hash))
);
} }
} }