Tighten up storage_stage changes
This commit is contained in:
parent
137233b4a1
commit
f9f493ee7a
|
@ -35,14 +35,14 @@ pub struct EntryMeta {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl EntryMeta {
|
impl EntryMeta {
|
||||||
pub fn default_with_entry(entry: &Entry) -> Self {
|
pub fn new(entry: Entry) -> Self {
|
||||||
EntryMeta {
|
Self {
|
||||||
tick_height: 0,
|
tick_height: 0,
|
||||||
slot: 0,
|
slot: 0,
|
||||||
slot_leader: Pubkey::default(),
|
slot_leader: Pubkey::default(),
|
||||||
num_ticks_left_in_slot: 0,
|
num_ticks_left_in_slot: 0,
|
||||||
parent_slot: None,
|
parent_slot: None,
|
||||||
entry: entry.clone(),
|
entry,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -532,10 +532,7 @@ mod tests {
|
||||||
STORAGE_ROTATE_TEST_COUNT,
|
STORAGE_ROTATE_TEST_COUNT,
|
||||||
&cluster_info,
|
&cluster_info,
|
||||||
);
|
);
|
||||||
let entries_meta: Vec<EntryMeta> = entries
|
let entries_meta: Vec<EntryMeta> = entries.into_iter().map(EntryMeta::new).collect();
|
||||||
.iter()
|
|
||||||
.map(|entry| EntryMeta::default_with_entry(entry))
|
|
||||||
.collect();
|
|
||||||
storage_entry_sender.send(entries_meta.clone()).unwrap();
|
storage_entry_sender.send(entries_meta.clone()).unwrap();
|
||||||
|
|
||||||
let keypair = Keypair::new();
|
let keypair = Keypair::new();
|
||||||
|
@ -601,10 +598,7 @@ mod tests {
|
||||||
STORAGE_ROTATE_TEST_COUNT,
|
STORAGE_ROTATE_TEST_COUNT,
|
||||||
&cluster_info,
|
&cluster_info,
|
||||||
);
|
);
|
||||||
let entries_meta: Vec<EntryMeta> = entries
|
let entries_meta: Vec<EntryMeta> = entries.into_iter().map(EntryMeta::new).collect();
|
||||||
.iter()
|
|
||||||
.map(|entry| EntryMeta::default_with_entry(entry))
|
|
||||||
.collect();
|
|
||||||
storage_entry_sender.send(entries_meta.clone()).unwrap();
|
storage_entry_sender.send(entries_meta.clone()).unwrap();
|
||||||
|
|
||||||
let mut reference_keys;
|
let mut reference_keys;
|
||||||
|
@ -617,11 +611,7 @@ mod tests {
|
||||||
let keypair = Keypair::new();
|
let keypair = Keypair::new();
|
||||||
let vote_tx = VoteTransaction::new_vote(&keypair, 123456, Hash::default(), 1);
|
let vote_tx = VoteTransaction::new_vote(&keypair, 123456, Hash::default(), 1);
|
||||||
vote_txs.push(vote_tx);
|
vote_txs.push(vote_tx);
|
||||||
let vote_entries = vec![EntryMeta::default_with_entry(&Entry::new(
|
let vote_entries = vec![EntryMeta::new(Entry::new(&Hash::default(), 1, vote_txs))];
|
||||||
&Hash::default(),
|
|
||||||
1,
|
|
||||||
vote_txs,
|
|
||||||
))];
|
|
||||||
storage_entry_sender.send(vote_entries).unwrap();
|
storage_entry_sender.send(vote_entries).unwrap();
|
||||||
|
|
||||||
for _ in 0..5 {
|
for _ in 0..5 {
|
||||||
|
|
Loading…
Reference in New Issue