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

This commit is contained in:
Michael Vines 2019-02-21 11:34:42 -08:00 committed by Grimes
parent 511085b747
commit c94bc2a0b6
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/replay_stage.rs
View File

@ -190,7 +190,7 @@ impl ReplayStage {
cluster_info: Arc<RwLock<ClusterInfo>>, cluster_info: Arc<RwLock<ClusterInfo>>,
exit: Arc<AtomicBool>, exit: Arc<AtomicBool>,
mut current_blob_index: u64, mut current_blob_index: u64,
last_entry_id: Arc<RwLock<Hash>>, last_entry_id: Hash,
to_leader_sender: &TvuRotationSender, to_leader_sender: &TvuRotationSender,
ledger_signal_receiver: Receiver<bool>, ledger_signal_receiver: Receiver<bool>,
leader_scheduler: &Arc<RwLock<LeaderScheduler>>, leader_scheduler: &Arc<RwLock<LeaderScheduler>>,
@ -200,6 +200,7 @@ impl ReplayStage {
let exit_ = exit.clone(); let exit_ = exit.clone();
let leader_scheduler_ = leader_scheduler.clone(); let leader_scheduler_ = leader_scheduler.clone();
let to_leader_sender = to_leader_sender.clone(); let to_leader_sender = to_leader_sender.clone();
let last_entry_id = Arc::new(RwLock::new(last_entry_id));
let subscriptions_ = subscriptions.clone(); let subscriptions_ = subscriptions.clone();
let t_replay = Builder::new() let t_replay = Builder::new()
.name("solana-replay-stage".to_string()) .name("solana-replay-stage".to_string())
@ -465,7 +466,7 @@ mod test {
Arc::new(RwLock::new(cluster_info_me)), Arc::new(RwLock::new(cluster_info_me)),
exit.clone(), exit.clone(),
meta.consumed, meta.consumed,
Arc::new(RwLock::new(last_entry_id)), last_entry_id,
&rotation_sender, &rotation_sender,
l_receiver, l_receiver,
&leader_scheduler, &leader_scheduler,
@ -569,7 +570,7 @@ mod test {
cluster_info_me.clone(), cluster_info_me.clone(),
exit.clone(), exit.clone(),
entry_height, entry_height,
Arc::new(RwLock::new(last_entry_id)), last_entry_id,
&to_leader_sender, &to_leader_sender,
l_receiver, l_receiver,
&leader_scheduler, &leader_scheduler,
@ -695,7 +696,7 @@ mod test {
cluster_info_me.clone(), cluster_info_me.clone(),
exit.clone(), exit.clone(),
meta.consumed, meta.consumed,
Arc::new(RwLock::new(last_entry_id)), last_entry_id,
&rotation_tx, &rotation_tx,
l_receiver, l_receiver,
&leader_scheduler, &leader_scheduler,

10
src/tvu.rs
View File

@ -48,7 +48,6 @@ pub struct Tvu {
entry_stream_stage: Option<EntryStreamStage>, entry_stream_stage: Option<EntryStreamStage>,
storage_stage: StorageStage, storage_stage: StorageStage,
exit: Arc<AtomicBool>, exit: Arc<AtomicBool>,
last_entry_id: Arc<RwLock<Hash>>,
} }
pub struct Sockets { pub struct Sockets {
@ -122,8 +121,6 @@ impl Tvu {
exit.clone(), exit.clone(),
); );
let l_last_entry_id = Arc::new(RwLock::new(last_entry_id));
let (replay_stage, mut previous_receiver) = ReplayStage::new( let (replay_stage, mut previous_receiver) = ReplayStage::new(
keypair.pubkey(), keypair.pubkey(),
voting_keypair, voting_keypair,
@ -132,7 +129,7 @@ impl Tvu {
cluster_info.clone(), cluster_info.clone(),
exit.clone(), exit.clone(),
blob_index, blob_index,
l_last_entry_id.clone(), last_entry_id,
to_leader_sender, to_leader_sender,
ledger_signal_receiver, ledger_signal_receiver,
&leader_scheduler, &leader_scheduler,
@ -171,14 +168,9 @@ impl Tvu {
entry_stream_stage, entry_stream_stage,
storage_stage, storage_stage,
exit, exit,
last_entry_id: l_last_entry_id,
} }
} }
pub fn get_state(&self) -> Hash {
*self.last_entry_id.read().unwrap()
}
pub fn is_exited(&self) -> bool { pub fn is_exited(&self) -> bool {
self.exit.load(Ordering::Relaxed) self.exit.load(Ordering::Relaxed)
} }