Remove dead code

This commit is contained in:
Michael Vines 2019-03-04 19:46:24 -08:00
parent 3fc846d789
commit 6a8a97f644

View File

@ -24,9 +24,7 @@ use std::time::{Duration, Instant};
#[derive(Debug, PartialEq, Eq, Clone)] #[derive(Debug, PartialEq, Eq, Clone)]
pub enum BroadcastStageReturnType { pub enum BroadcastStageReturnType {
LeaderRotation,
ChannelDisconnected, ChannelDisconnected,
ExitSignal,
} }
struct Broadcast { struct Broadcast {
@ -179,7 +177,6 @@ impl BroadcastStage {
sock: &UdpSocket, sock: &UdpSocket,
cluster_info: &Arc<RwLock<ClusterInfo>>, cluster_info: &Arc<RwLock<ClusterInfo>>,
receiver: &Receiver<WorkingBankEntries>, receiver: &Receiver<WorkingBankEntries>,
exit_signal: &Arc<AtomicBool>,
blocktree: &Arc<Blocktree>, blocktree: &Arc<Blocktree>,
) -> BroadcastStageReturnType { ) -> BroadcastStageReturnType {
let me = cluster_info.read().unwrap().my_data().clone(); let me = cluster_info.read().unwrap().my_data().clone();
@ -191,9 +188,6 @@ impl BroadcastStage {
}; };
loop { loop {
if exit_signal.load(Ordering::Relaxed) {
return BroadcastStageReturnType::ExitSignal;
}
if let Err(e) = broadcast.run(&cluster_info, receiver, sock, blocktree) { if let Err(e) = broadcast.run(&cluster_info, receiver, sock, blocktree) {
match e { match e {
Error::RecvTimeoutError(RecvTimeoutError::Disconnected) | Error::SendError => { Error::RecvTimeoutError(RecvTimeoutError::Disconnected) | Error::SendError => {
@ -233,13 +227,12 @@ impl BroadcastStage {
exit_sender: Arc<AtomicBool>, exit_sender: Arc<AtomicBool>,
blocktree: &Arc<Blocktree>, blocktree: &Arc<Blocktree>,
) -> Self { ) -> Self {
let exit_signal = Arc::new(AtomicBool::new(false));
let blocktree = blocktree.clone(); let blocktree = blocktree.clone();
let thread_hdl = Builder::new() let thread_hdl = Builder::new()
.name("solana-broadcaster".to_string()) .name("solana-broadcaster".to_string())
.spawn(move || { .spawn(move || {
let _exit = Finalizer::new(exit_sender); let _exit = Finalizer::new(exit_sender);
Self::run(&sock, &cluster_info, &receiver, &exit_signal, &blocktree) Self::run(&sock, &cluster_info, &receiver, &blocktree)
}) })
.unwrap(); .unwrap();