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

Remove dead code (#9404) 

automerge
This commit is contained in:
Michael Vines 2020-04-09 13:09:59 -07:00 committed by GitHub
parent aab9d9229c
commit f3afe5c99c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/broadcast_stage/standard_broadcast_run.rs
View File

@ -476,11 +476,9 @@ mod test {
.receive_elapsed = 10; .receive_elapsed = 10;
// Try to fetch ticks from blockstore, nothing should break // Try to fetch ticks from blockstore, nothing should break
assert_eq!(blockstore.get_slot_entries(0, 0, None).unwrap(), ticks0); assert_eq!(blockstore.get_slot_entries(0, 0).unwrap(), ticks0);
assert_eq!( assert_eq!(
blockstore blockstore.get_slot_entries(0, num_shreds_per_slot).unwrap(),
.get_slot_entries(0, num_shreds_per_slot, None)
.unwrap(),
vec![], vec![],
); );
@ -516,11 +514,9 @@ mod test {
); );
// Try to fetch the incomplete ticks from blockstore, should succeed // Try to fetch the incomplete ticks from blockstore, should succeed
assert_eq!(blockstore.get_slot_entries(0, 0, None).unwrap(), ticks0); assert_eq!(blockstore.get_slot_entries(0, 0).unwrap(), ticks0);
assert_eq!( assert_eq!(
blockstore blockstore.get_slot_entries(0, num_shreds_per_slot).unwrap(),
.get_slot_entries(0, num_shreds_per_slot, None)
.unwrap(),
vec![], vec![],
); );
} }

5
core/src/window_service.rs
View File

@ -542,10 +542,7 @@ mod test {
.insert_shreds(shreds, None, false) .insert_shreds(shreds, None, false)
.expect("Expect successful processing of shred"); .expect("Expect successful processing of shred");
assert_eq!( assert_eq!(blockstore.get_slot_entries(0, 0).unwrap(), original_entries);
blockstore.get_slot_entries(0, 0, None).unwrap(),
original_entries
);
drop(blockstore); drop(blockstore);
Blockstore::destroy(&blockstore_path).expect("Expected successful database destruction"); Blockstore::destroy(&blockstore_path).expect("Expected successful database destruction");

6
ledger-tool/src/main.rs
View File

@ -71,7 +71,7 @@ fn output_slot(
) -> Result<(), String> { ) -> Result<(), String> {
println!("Slot Meta {:?}", blockstore.meta(slot)); println!("Slot Meta {:?}", blockstore.meta(slot));
let entries = blockstore let entries = blockstore
.get_slot_entries(slot, 0, None) .get_slot_entries(slot, 0)
.map_err(|err| format!("Failed to load entries for slot {}: {}", slot, err))?; .map_err(|err| format!("Failed to load entries for slot {}: {}", slot, err))?;
for (entry_index, entry) in entries.iter().enumerate() { for (entry_index, entry) in entries.iter().enumerate() {
@ -1159,7 +1159,7 @@ fn main() {
let potential_hashes: Vec<_> = iter let potential_hashes: Vec<_> = iter
.filter_map(|(slot, _meta)| { .filter_map(|(slot, _meta)| {
let blockhash = blockstore let blockhash = blockstore
.get_slot_entries(slot, 0, None) .get_slot_entries(slot, 0)
.unwrap() .unwrap()
.last() .last()
.unwrap() .unwrap()
@ -1202,7 +1202,7 @@ fn main() {
.filter_map(|(slot, _meta)| { .filter_map(|(slot, _meta)| {
if slot <= max_height as u64 { if slot <= max_height as u64 {
let blockhash = blockstore let blockhash = blockstore
.get_slot_entries(slot, 0, None) .get_slot_entries(slot, 0)
.unwrap() .unwrap()
.last() .last()
.unwrap() .unwrap()

52
ledger/src/blockstore.rs
View File

@ -1503,13 +1503,13 @@ impl Blockstore {
} }
}; };
let slot_entries = self.get_slot_entries(slot, 0, None)?; let slot_entries = self.get_slot_entries(slot, 0)?;
if !slot_entries.is_empty() { if !slot_entries.is_empty() {
let slot_transaction_iterator = slot_entries let slot_transaction_iterator = slot_entries
.iter() .iter()
.cloned() .cloned()
.flat_map(|entry| entry.transactions); .flat_map(|entry| entry.transactions);
let parent_slot_entries = self.get_slot_entries(slot_meta.parent_slot, 0, None)?; let parent_slot_entries = self.get_slot_entries(slot_meta.parent_slot, 0)?;
let previous_blockhash = if !parent_slot_entries.is_empty() { let previous_blockhash = if !parent_slot_entries.is_empty() {
get_last_hash(parent_slot_entries.iter()).unwrap() get_last_hash(parent_slot_entries.iter()).unwrap()
} else { } else {
@ -1749,7 +1749,7 @@ impl Blockstore {
slot: Slot, slot: Slot,
signature: Signature, signature: Signature,
) -> Result<Option<Transaction>> { ) -> Result<Option<Transaction>> {
let slot_entries = self.get_slot_entries(slot, 0, None)?; let slot_entries = self.get_slot_entries(slot, 0)?;
Ok(slot_entries Ok(slot_entries
.iter() .iter()
.cloned() .cloned()
@ -1766,7 +1766,7 @@ impl Blockstore {
} }
fn get_block_timestamps(&self, slot: Slot) -> Result<Vec<(Pubkey, (Slot, UnixTimestamp))>> { fn get_block_timestamps(&self, slot: Slot) -> Result<Vec<(Pubkey, (Slot, UnixTimestamp))>> {
let slot_entries = self.get_slot_entries(slot, 0, None)?; let slot_entries = self.get_slot_entries(slot, 0)?;
Ok(slot_entries Ok(slot_entries
.iter() .iter()
.cloned() .cloned()
@ -1796,12 +1796,7 @@ impl Blockstore {
} }
/// Returns the entry vector for the slot starting with `shred_start_index` /// Returns the entry vector for the slot starting with `shred_start_index`
pub fn get_slot_entries( pub fn get_slot_entries(&self, slot: Slot, shred_start_index: u64) -> Result<Vec<Entry>> {
&self,
slot: Slot,
shred_start_index: u64,
_max_entries: Option<u64>,
) -> Result<Vec<Entry>> {
self.get_slot_entries_with_shred_info(slot, shred_start_index) self.get_slot_entries_with_shred_info(slot, shred_start_index)
.map(|x| x.0) .map(|x| x.0)
} }
@ -2914,7 +2909,7 @@ pub mod tests {
let ledger = Blockstore::open(&ledger_path).unwrap(); let ledger = Blockstore::open(&ledger_path).unwrap();
let ticks = create_ticks(genesis_config.ticks_per_slot, 0, genesis_config.hash()); let ticks = create_ticks(genesis_config.ticks_per_slot, 0, genesis_config.hash());
let entries = ledger.get_slot_entries(0, 0, None).unwrap(); let entries = ledger.get_slot_entries(0, 0).unwrap();
assert_eq!(ticks, entries); assert_eq!(ticks, entries);
@ -3004,7 +2999,7 @@ pub mod tests {
assert_eq!( assert_eq!(
&ticks[(i * ticks_per_slot) as usize..((i + 1) * ticks_per_slot) as usize], &ticks[(i * ticks_per_slot) as usize..((i + 1) * ticks_per_slot) as usize],
&ledger.get_slot_entries(i, 0, None).unwrap()[..] &ledger.get_slot_entries(i, 0).unwrap()[..]
); );
} }
@ -3032,7 +3027,7 @@ pub mod tests {
assert_eq!( assert_eq!(
&ticks[0..1], &ticks[0..1],
&ledger &ledger
.get_slot_entries(num_slots, ticks_per_slot - 2, None) .get_slot_entries(num_slots, ticks_per_slot - 2)
.unwrap()[..] .unwrap()[..]
); );
@ -3046,7 +3041,7 @@ pub mod tests {
assert_eq!( assert_eq!(
&ticks[1..2], &ticks[1..2],
&ledger.get_slot_entries(num_slots + 1, 0, None).unwrap()[..] &ledger.get_slot_entries(num_slots + 1, 0).unwrap()[..]
); );
*/ */
} }
@ -3200,7 +3195,7 @@ pub mod tests {
assert!(shreds.len() > 1); assert!(shreds.len() > 1);
let last_shred = shreds.pop().unwrap(); let last_shred = shreds.pop().unwrap();
ledger.insert_shreds(vec![last_shred], None, false).unwrap(); ledger.insert_shreds(vec![last_shred], None, false).unwrap();
assert!(ledger.get_slot_entries(0, 0, None).unwrap().is_empty()); assert!(ledger.get_slot_entries(0, 0).unwrap().is_empty());
let meta = ledger let meta = ledger
.meta(0) .meta(0)
@ -3210,7 +3205,7 @@ pub mod tests {
// Insert the other shreds, check for consecutive returned entries // Insert the other shreds, check for consecutive returned entries
ledger.insert_shreds(shreds, None, false).unwrap(); ledger.insert_shreds(shreds, None, false).unwrap();
let result = ledger.get_slot_entries(0, 0, None).unwrap(); let result = ledger.get_slot_entries(0, 0).unwrap();
assert_eq!(result, entries); assert_eq!(result, entries);
@ -3244,7 +3239,7 @@ pub mod tests {
for i in (0..num_shreds).rev() { for i in (0..num_shreds).rev() {
let shred = shreds.pop().unwrap(); let shred = shreds.pop().unwrap();
ledger.insert_shreds(vec![shred], None, false).unwrap(); ledger.insert_shreds(vec![shred], None, false).unwrap();
let result = ledger.get_slot_entries(0, 0, None).unwrap(); let result = ledger.get_slot_entries(0, 0).unwrap();
let meta = ledger let meta = ledger
.meta(0) .meta(0)
@ -3333,7 +3328,7 @@ pub mod tests {
.expect("Expected successful write of shreds"); .expect("Expected successful write of shreds");
assert_eq!( assert_eq!(
blockstore.get_slot_entries(1, 0, None).unwrap()[2..4], blockstore.get_slot_entries(1, 0).unwrap()[2..4],
entries[2..4], entries[2..4],
); );
} }
@ -3367,7 +3362,7 @@ pub mod tests {
.expect("Expected successful write of shreds"); .expect("Expected successful write of shreds");
assert_eq!( assert_eq!(
blockstore blockstore
.get_slot_entries(slot, u64::from(index - 1), None) .get_slot_entries(slot, u64::from(index - 1))
.unwrap(), .unwrap(),
vec![last_entry], vec![last_entry],
); );
@ -3398,7 +3393,7 @@ pub mod tests {
blockstore blockstore
.insert_shreds(shreds, None, false) .insert_shreds(shreds, None, false)
.expect("Expected successful write of shreds"); .expect("Expected successful write of shreds");
assert_eq!(blockstore.get_slot_entries(slot, 0, None).unwrap(), entries); assert_eq!(blockstore.get_slot_entries(slot, 0).unwrap(), entries);
} }
} }
Blockstore::destroy(&blockstore_path).expect("Expected successful database destruction"); Blockstore::destroy(&blockstore_path).expect("Expected successful database destruction");
@ -3433,7 +3428,7 @@ pub mod tests {
blockstore.insert_shreds(odd_shreds, None, false).unwrap(); blockstore.insert_shreds(odd_shreds, None, false).unwrap();
assert_eq!(blockstore.get_slot_entries(slot, 0, None).unwrap(), vec![]); assert_eq!(blockstore.get_slot_entries(slot, 0).unwrap(), vec![]);
let meta = blockstore.meta(slot).unwrap().unwrap(); let meta = blockstore.meta(slot).unwrap().unwrap();
if num_shreds % 2 == 0 { if num_shreds % 2 == 0 {
@ -3452,7 +3447,7 @@ pub mod tests {
blockstore.insert_shreds(even_shreds, None, false).unwrap(); blockstore.insert_shreds(even_shreds, None, false).unwrap();
assert_eq!( assert_eq!(
blockstore.get_slot_entries(slot, 0, None).unwrap(), blockstore.get_slot_entries(slot, 0).unwrap(),
original_entries, original_entries,
); );
@ -3486,7 +3481,7 @@ pub mod tests {
.insert_shreds(original_shreds, None, false) .insert_shreds(original_shreds, None, false)
.unwrap(); .unwrap();
assert_eq!(blockstore.get_slot_entries(0, 0, None).unwrap(), vec![]); assert_eq!(blockstore.get_slot_entries(0, 0).unwrap(), vec![]);
let duplicate_shreds = entries_to_test_shreds(original_entries.clone(), 0, 0, true, 0); let duplicate_shreds = entries_to_test_shreds(original_entries.clone(), 0, 0, true, 0);
let num_shreds = duplicate_shreds.len() as u64; let num_shreds = duplicate_shreds.len() as u64;
@ -3494,10 +3489,7 @@ pub mod tests {
.insert_shreds(duplicate_shreds, None, false) .insert_shreds(duplicate_shreds, None, false)
.unwrap(); .unwrap();
assert_eq!( assert_eq!(blockstore.get_slot_entries(0, 0).unwrap(), original_entries);
blockstore.get_slot_entries(0, 0, None).unwrap(),
original_entries
);
let meta = blockstore.meta(0).unwrap().unwrap(); let meta = blockstore.meta(0).unwrap().unwrap();
assert_eq!(meta.consumed, num_shreds); assert_eq!(meta.consumed, num_shreds);
@ -4178,7 +4170,7 @@ pub mod tests {
for i in 0..num_entries - 1 { for i in 0..num_entries - 1 {
assert_eq!( assert_eq!(
blockstore.get_slot_entries(i, 0, None).unwrap()[0], blockstore.get_slot_entries(i, 0).unwrap()[0],
entries[i as usize] entries[i as usize]
); );
@ -4921,7 +4913,7 @@ pub mod tests {
.insert_shreds(shreds, None, false) .insert_shreds(shreds, None, false)
.expect("Expected successful write of shreds"); .expect("Expected successful write of shreds");
assert_eq!( assert_eq!(
blockstore.get_slot_entries(slot, 0, None).unwrap().len() as u64, blockstore.get_slot_entries(slot, 0).unwrap().len() as u64,
num_ticks num_ticks
); );
@ -4943,7 +4935,7 @@ pub mod tests {
blockstore blockstore
.insert_shreds(shreds, None, false) .insert_shreds(shreds, None, false)
.expect("Expected successful write of shreds"); .expect("Expected successful write of shreds");
assert!(blockstore.get_slot_entries(slot, 0, None).is_err()); assert!(blockstore.get_slot_entries(slot, 0).is_err());
} }
Blockstore::destroy(&blockstore_path).expect("Expected successful database destruction"); Blockstore::destroy(&blockstore_path).expect("Expected successful database destruction");
} }

4
local-cluster/src/cluster_tests.rs
View File

@ -141,7 +141,7 @@ pub fn validator_exit(entry_point_info: &ContactInfo, nodes: usize) {
pub fn verify_ledger_ticks(ledger_path: &Path, ticks_per_slot: usize) { pub fn verify_ledger_ticks(ledger_path: &Path, ticks_per_slot: usize) {
let ledger = Blockstore::open(ledger_path).unwrap(); let ledger = Blockstore::open(ledger_path).unwrap();
let zeroth_slot = ledger.get_slot_entries(0, 0, None).unwrap(); let zeroth_slot = ledger.get_slot_entries(0, 0).unwrap();
let last_id = zeroth_slot.last().unwrap().hash; let last_id = zeroth_slot.last().unwrap().hash;
let next_slots = ledger.get_slots_since(&[0]).unwrap().remove(&0).unwrap(); let next_slots = ledger.get_slots_since(&[0]).unwrap().remove(&0).unwrap();
let mut pending_slots: Vec<_> = next_slots let mut pending_slots: Vec<_> = next_slots
@ -306,7 +306,7 @@ fn get_and_verify_slot_entries(
slot: Slot, slot: Slot,
last_entry: &Hash, last_entry: &Hash,
) -> Vec<Entry> { ) -> Vec<Entry> {
let entries = blockstore.get_slot_entries(slot, 0, None).unwrap(); let entries = blockstore.get_slot_entries(slot, 0).unwrap();
assert_eq!(entries.verify(last_entry), true); assert_eq!(entries.verify(last_entry), true);
entries entries
} }