Remove obsoleted code from shred (#5954)

* Remove obsoleted code from shred

* fix broken test
This commit is contained in:
Pankaj Garg
2019-09-18 13:56:44 -07:00
committed by GitHub
parent 86213d38fe
commit 6c4e656795
4 changed files with 99 additions and 363 deletions

View File

@ -1928,9 +1928,11 @@ mod tests {
0,
);
assert!(rv.is_empty());
let mut shred = Shred::Data(DataShred::default());
shred.set_slot(2);
shred.set_index(1);
let mut data_shred = DataShred::default();
data_shred.header.data_header.slot = 2;
data_shred.header.parent_offset = 1;
data_shred.header.data_header.index = 1;
let shred = Shred::Data(data_shred);
let shred_info = ShredInfo::new_from_shred(&shred);
blocktree
@ -1946,9 +1948,11 @@ mod tests {
1,
);
assert!(!rv.is_empty());
let rv: Vec<Shred> = rv
let rv: Vec<ShredInfo> = rv
.into_iter()
.map(|b| bincode::deserialize(&b.read().unwrap().data).unwrap())
.filter_map(|b| {
ShredInfo::new_from_serialized_shred(b.read().unwrap().data.to_vec()).ok()
})
.collect();
assert_eq!(rv[0].index(), 1);
assert_eq!(rv[0].slot(), 2);
@ -1978,9 +1982,11 @@ mod tests {
let rv =
ClusterInfo::run_highest_window_request(&socketaddr_any!(), Some(&blocktree), 2, 1);
let rv: Vec<Shred> = rv
let rv: Vec<ShredInfo> = rv
.into_iter()
.map(|b| bincode::deserialize(&b.read().unwrap().data).unwrap())
.filter_map(|b| {
ShredInfo::new_from_serialized_shred(b.read().unwrap().data.to_vec()).ok()
})
.collect();
assert!(!rv.is_empty());
let index = blocktree.meta(2).unwrap().unwrap().received - 1;