diff --git a/core/src/staked_nodes_updater_service.rs b/core/src/staked_nodes_updater_service.rs index db5116a6ab..e65526f704 100644 --- a/core/src/staked_nodes_updater_service.rs +++ b/core/src/staked_nodes_updater_service.rs @@ -35,14 +35,12 @@ impl StakedNodesUpdaterService { let mut last_stakes = Instant::now(); while !exit.load(Ordering::Relaxed) { let overrides = shared_staked_nodes_overrides.read().unwrap(); - let mut new_ip_to_stake = HashMap::new(); let mut new_id_to_stake = HashMap::new(); let mut total_stake = 0; let mut max_stake: u64 = 0; let mut min_stake: u64 = u64::MAX; if Self::try_refresh_stake_maps( &mut last_stakes, - &mut new_ip_to_stake, &mut new_id_to_stake, &mut total_stake, &mut max_stake, @@ -53,7 +51,6 @@ impl StakedNodesUpdaterService { ) { let mut shared = shared_staked_nodes.write().unwrap(); shared.total_stake = total_stake; - shared.ip_stake_map = new_ip_to_stake; shared.pubkey_stake_map = new_id_to_stake; } } @@ -65,7 +62,6 @@ impl StakedNodesUpdaterService { fn try_refresh_stake_maps( last_stakes: &mut Instant, - ip_to_stake: &mut HashMap, id_to_stake: &mut HashMap, total_stake: &mut u64, max_stake: &mut u64, @@ -92,28 +88,11 @@ impl StakedNodesUpdaterService { Some((node.id, *stake)) }) .collect(); - *ip_to_stake = cluster_info - .tvu_peers() - .into_iter() - .filter_map(|node| { - let stake = staked_nodes.get(&node.id)?; - Some((node.tvu.ip(), *stake)) - }) - .collect(); let my_pubkey = *cluster_info.my_contact_info().pubkey(); if let Some(stake) = staked_nodes.get(&my_pubkey) { id_to_stake.insert(my_pubkey, *stake); - if let Ok(tvu) = cluster_info.my_contact_info().tvu() { - ip_to_stake.insert(tvu.ip(), *stake); - } } - Self::override_stake( - cluster_info, - total_stake, - id_to_stake, - ip_to_stake, - overrides, - ); + Self::override_stake(cluster_info, total_stake, id_to_stake, overrides); *last_stakes = Instant::now(); true @@ -127,7 +106,6 @@ impl StakedNodesUpdaterService { cluster_info: &ClusterInfo, total_stake: &mut u64, id_to_stake_map: &mut HashMap, - ip_to_stake_map: &mut HashMap, staked_map_overrides: &HashMap, ) { let nodes: HashMap = cluster_info @@ -136,13 +114,12 @@ impl StakedNodesUpdaterService { .map(|(node, _)| (node.id, node.tvu.ip())) .collect(); for (id_override, stake_override) in staked_map_overrides { - if let Some(&ip_override) = nodes.get(id_override) { + if nodes.contains_key(id_override) { if let Some(previous_stake) = id_to_stake_map.get(id_override) { *total_stake -= previous_stake; } *total_stake += stake_override; id_to_stake_map.insert(*id_override, *stake_override); - ip_to_stake_map.insert(ip_override, *stake_override); } else { error!( "staked nodes overrides configuration for id \ diff --git a/streamer/src/streamer.rs b/streamer/src/streamer.rs index 0a4006079f..e82d5683b1 100644 --- a/streamer/src/streamer.rs +++ b/streamer/src/streamer.rs @@ -30,7 +30,6 @@ pub struct StakedNodes { pub total_stake: u64, pub max_stake: u64, pub min_stake: u64, - pub ip_stake_map: HashMap, pub pubkey_stake_map: HashMap, }