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

Removed Shred enum (#5963)

Browse Source 
* Remove shred enum and it's references

* rename ShredInfo to Shred

* clippy
This commit is contained in:
Pankaj Garg
2019-09-18 16:24:30 -07:00
committed by GitHub
parent d93b552e8c
commit 783e8672e7
12 changed files with 230 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/cluster_info.rs
View File

@ -1768,7 +1768,7 @@ mod tests {
use crate::crds_value::CrdsValueLabel;
use crate::repair_service::RepairType;
use crate::result::Error;
use crate::shred::{DataShred, Shred, ShredInfo};
use crate::shred::{DataShredHeader, Shred};
use crate::test_tx::test_tx;
use solana_sdk::clock::DEFAULT_TICKS_PER_SLOT;
use solana_sdk::hash::Hash;
@ -1928,12 +1928,11 @@ mod tests {
0,
);
assert!(rv.is_empty());
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);
let mut data_shred = DataShredHeader::default();
data_shred.data_header.slot = 2;
data_shred.parent_offset = 1;
data_shred.data_header.index = 1;
let shred_info = Shred::new_empty_from_header(data_shred);
blocktree
.insert_shreds(vec![shred_info], None)
@ -1948,10 +1947,10 @@ mod tests {
1,
);
assert!(!rv.is_empty());
let rv: Vec<ShredInfo> = rv
let rv: Vec<Shred> = rv
.into_iter()
.filter_map(|b| {
ShredInfo::new_from_serialized_shred(b.read().unwrap().data.to_vec()).ok()
Shred::new_from_serialized_shred(b.read().unwrap().data.to_vec()).ok()
})
.collect();
assert_eq!(rv[0].index(), 1);
@ -1982,10 +1981,10 @@ mod tests {
let rv =
ClusterInfo::run_highest_window_request(&socketaddr_any!(), Some(&blocktree), 2, 1);
let rv: Vec<ShredInfo> = rv
let rv: Vec<Shred> = rv
.into_iter()
.filter_map(|b| {
ShredInfo::new_from_serialized_shred(b.read().unwrap().data.to_vec()).ok()
Shred::new_from_serialized_shred(b.read().unwrap().data.to_vec()).ok()
})
.collect();
assert!(!rv.is_empty());