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

Removed some dead code (#4563) 

* Removed some dead code

* remove dead code from Replicator
This commit is contained in:
Pankaj Garg 2019-06-06 14:26:12 -07:00 committed by GitHub
parent 2ae595294c
commit 194491ae96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/replicator.rs
View File

@ -406,7 +406,7 @@ impl Replicator {
#[cfg(feature = "chacha")] #[cfg(feature = "chacha")]
{ {
use crate::storage_stage::NUM_STORAGE_SAMPLES; use crate::storage_stage::NUM_STORAGE_SAMPLES;
use rand::{Rng, SeedableRng}; use rand::SeedableRng;
use rand_chacha::ChaChaRng; use rand_chacha::ChaChaRng;
let mut rng_seed = [0u8; 32]; let mut rng_seed = [0u8; 32];

12
core/src/retransmit_stage.rs
View File

@ -3,7 +3,6 @@
use crate::bank_forks::BankForks; use crate::bank_forks::BankForks;
use crate::blocktree::{Blocktree, CompletedSlotsReceiver}; use crate::blocktree::{Blocktree, CompletedSlotsReceiver};
use crate::cluster_info::{compute_retransmit_peers, ClusterInfo, DATA_PLANE_FANOUT}; use crate::cluster_info::{compute_retransmit_peers, ClusterInfo, DATA_PLANE_FANOUT};
use crate::contact_info::ContactInfo;
use crate::leader_schedule_cache::LeaderScheduleCache; use crate::leader_schedule_cache::LeaderScheduleCache;
use crate::repair_service::RepairStrategy; use crate::repair_service::RepairStrategy;
use crate::result::{Error, Result}; use crate::result::{Error, Result};
@ -11,7 +10,6 @@ use crate::service::Service;
use crate::staking_utils; use crate::staking_utils;
use crate::streamer::BlobReceiver; use crate::streamer::BlobReceiver;
use crate::window_service::{should_retransmit_and_persist, WindowService}; use crate::window_service::{should_retransmit_and_persist, WindowService};
use hashbrown::HashMap;
use rand::SeedableRng; use rand::SeedableRng;
use rand_chacha::ChaChaRng; use rand_chacha::ChaChaRng;
use solana_metrics::{datapoint_info, inc_new_counter_error}; use solana_metrics::{datapoint_info, inc_new_counter_error};
@ -30,8 +28,6 @@ fn retransmit(
cluster_info: &Arc<RwLock<ClusterInfo>>, cluster_info: &Arc<RwLock<ClusterInfo>>,
r: &BlobReceiver, r: &BlobReceiver,
sock: &UdpSocket, sock: &UdpSocket,
avalanche_topology_cache: &mut HashMap<u64, (Vec<ContactInfo>, Vec<ContactInfo>)>,
cache_history: &mut Vec<u64>,
) -> Result<()> { ) -> Result<()> {
let timer = Duration::new(1, 0); let timer = Duration::new(1, 0);
let mut blobs = r.recv_timeout(timer)?; let mut blobs = r.recv_timeout(timer)?;
@ -62,10 +58,6 @@ fn retransmit(
ClusterInfo::retransmit_to(&cluster_info, &children, blob, leader, sock, true)?; ClusterInfo::retransmit_to(&cluster_info, &children, blob, leader, sock, true)?;
} }
} }
while cache_history.len() > 5 {
avalanche_topology_cache.remove(&cache_history.pop().unwrap());
}
Ok(()) Ok(())
} }
@ -90,8 +82,6 @@ fn retransmitter(
.name("solana-retransmitter".to_string()) .name("solana-retransmitter".to_string())
.spawn(move || { .spawn(move || {
trace!("retransmitter started"); trace!("retransmitter started");
let mut avalanche_topology_cache = HashMap::new();
let mut cache_history = vec![];
loop { loop {
if let Err(e) = retransmit( if let Err(e) = retransmit(
&bank_forks, &bank_forks,
@ -99,8 +89,6 @@ fn retransmitter(
&cluster_info, &cluster_info,
&r, &r,
&sock, &sock,
&mut avalanche_topology_cache,
&mut cache_history,
) { ) {
match e { match e {
Error::RecvTimeoutError(RecvTimeoutError::Disconnected) => break, Error::RecvTimeoutError(RecvTimeoutError::Disconnected) => break,