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

Cleanup typos/comments in Bootstrap (#21171)

This commit is contained in:
Brooks Prumo 2021-11-04 08:21:33 -05:00 committed by GitHub
parent b1e3a82c11
commit d2974fcefc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
validator/src/bootstrap.rs
View File

@ -1120,10 +1120,13 @@ mod with_incremental_snapshots {
#[derive(Debug, Copy, Clone, PartialEq, Eq)] #[derive(Debug, Copy, Clone, PartialEq, Eq)]
enum Strategy { enum Strategy {
Standard, Standard,
Fallback, WithoutFullSnapshotArchiveIntervalFiltering,
} }
for strategy in [Strategy::Standard, Strategy::Fallback] { for strategy in [
Strategy::Standard,
Strategy::WithoutFullSnapshotArchiveIntervalFiltering,
] {
let trusted_snapshot_hashes = let trusted_snapshot_hashes =
get_trusted_snapshot_hashes(cluster_info, validator_config); get_trusted_snapshot_hashes(cluster_info, validator_config);
@ -1150,7 +1153,7 @@ mod with_incremental_snapshots {
&mut peer_snapshot_hashes, &mut peer_snapshot_hashes,
); );
// However, if at this point peer_snasphot_hashes is empty, then retry from the // However, if at this point peer_snapshot_hashes is empty, then retry from the
// beginning with the "fallback" strategy and *do not* filter based on full // beginning with the "fallback" strategy and *do not* filter based on full
// snapshot archive interval. // snapshot archive interval.
if peer_snapshot_hashes.is_empty() { if peer_snapshot_hashes.is_empty() {
@ -1269,7 +1272,6 @@ mod with_incremental_snapshots {
continue; continue;
} }
// Get the highest incremental snapshot hash for this peer.
let mut highest_snapshot_hash = let mut highest_snapshot_hash =
get_highest_incremental_snapshot_hash_for_peer(cluster_info, &rpc_peer.id); get_highest_incremental_snapshot_hash_for_peer(cluster_info, &rpc_peer.id);
@ -1282,7 +1284,6 @@ mod with_incremental_snapshots {
highest_snapshot_hash = snapshot_hash; highest_snapshot_hash = snapshot_hash;
} }
// ...and add the highest snapshot hash to our return vector!
if let Some(snapshot_hash) = highest_snapshot_hash { if let Some(snapshot_hash) = highest_snapshot_hash {
peer_snapshot_hashes.push(PeerSnapshotHash { peer_snapshot_hashes.push(PeerSnapshotHash {
rpc_contact_info: rpc_peer.clone(), rpc_contact_info: rpc_peer.clone(),
@ -1870,7 +1871,7 @@ mod with_incremental_snapshots {
} }
#[test] #[test]
fn test_retain_peer_snapshot_hashes_with_highest_incremental_snasphot_slot() { fn test_retain_peer_snapshot_hashes_with_highest_incremental_snapshot_slot() {
let contact_info = default_contact_info_for_tests(); let contact_info = default_contact_info_for_tests();
let peer_snapshot_hashes = vec![ let peer_snapshot_hashes = vec![
PeerSnapshotHash::new(contact_info.clone(), (200_000, Hash::default()), None), PeerSnapshotHash::new(contact_info.clone(), (200_000, Hash::default()), None),