gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use BlobError for get_size return

Browse Source
This commit is contained in:
Stephen Akridge
2018-07-25 12:15:26 -07:00
committed by Rob Walker
parent 75212f40e7
commit 212874e155
3 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/packet.rs
View File

@ -139,11 +139,11 @@ impl Default for Blob {
}
}
//#[derive(Debug)]
//pub enum BlobError {
// /// the Blob's meta and data are not self-consistent
// BadState,
//}
#[derive(Debug)]
pub enum BlobError {
/// the Blob's meta and data are not self-consistent
BadState,
}
pub struct Recycler<T> {
gc: Arc<Mutex<Vec<Arc<RwLock<T>>>>>,
@ -379,26 +379,13 @@ impl Blob {
pub fn data_mut(&mut self) -> &mut [u8] {
&mut self.data[BLOB_HEADER_SIZE..]
}
pub fn get_size(&self) -> usize {
let size = self.get_data_size().unwrap() as usize;
pub fn get_size(&self) -> Result<usize> {
let size = self.get_data_size()? as usize;
if self.meta.size == size {
size - BLOB_HEADER_SIZE
Ok(size - BLOB_HEADER_SIZE)
} else {
0
Err(Error::BlobError(BlobError::BadState))
}
// TODO: return a Result<usize> instead of
// returning zero
//
//let size = self.get_data_size()? as usize;
//if self.meta.size == size {
// Ok(size - BLOB_HEADER_SIZE)
//} else {
// // these don't work...
// Err("bad state")
// // Err(BlobError::BadState)
//}
}
pub fn set_size(&mut self, size: usize) {
let new_size = size + BLOB_HEADER_SIZE;