blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tighten up storage_stage changes

This commit is contained in:
Greg Fitzgerald 2019-02-25 20:23:15 -07:00 committed by Tyera Eulberg
parent 137233b4a1
commit f9f493ee7a
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/entry.rs
View File

@ -35,14 +35,14 @@ pub struct EntryMeta {
}
impl EntryMeta {
pub fn default_with_entry(entry: &Entry) -> Self {
EntryMeta {
pub fn new(entry: Entry) -> Self {
Self {
tick_height: 0,
slot: 0,
slot_leader: Pubkey::default(),
num_ticks_left_in_slot: 0,
parent_slot: None,
entry: entry.clone(),
entry,
}
}
}

16
src/storage_stage.rs
View File

@ -532,10 +532,7 @@ mod tests {
STORAGE_ROTATE_TEST_COUNT,
&cluster_info,
);
let entries_meta: Vec<EntryMeta> = entries
.iter()
.map(|entry| EntryMeta::default_with_entry(entry))
.collect();
let entries_meta: Vec<EntryMeta> = entries.into_iter().map(EntryMeta::new).collect();
storage_entry_sender.send(entries_meta.clone()).unwrap();
let keypair = Keypair::new();
@ -601,10 +598,7 @@ mod tests {
STORAGE_ROTATE_TEST_COUNT,
&cluster_info,
);
let entries_meta: Vec<EntryMeta> = entries
.iter()
.map(|entry| EntryMeta::default_with_entry(entry))
.collect();
let entries_meta: Vec<EntryMeta> = entries.into_iter().map(EntryMeta::new).collect();
storage_entry_sender.send(entries_meta.clone()).unwrap();
let mut reference_keys;
@ -617,11 +611,7 @@ mod tests {
let keypair = Keypair::new();
let vote_tx = VoteTransaction::new_vote(&keypair, 123456, Hash::default(), 1);
vote_txs.push(vote_tx);
let vote_entries = vec![EntryMeta::default_with_entry(&Entry::new(
&Hash::default(),
1,
vote_txs,
))];
let vote_entries = vec![EntryMeta::new(Entry::new(&Hash::default(), 1, vote_txs))];
storage_entry_sender.send(vote_entries).unwrap();
for _ in 0..5 {