From 6e413331b57ee3b095519dcdd79f9b8d8aa17489 Mon Sep 17 00:00:00 2001
From: behzad nouri <behzadnouri@gmail.com>
Date: Fri, 13 Aug 2021 13:48:42 -0400
Subject: [PATCH] removes erroneous uses of Arc<...> from retransmit stage

---
 core/benches/retransmit_stage.rs |  2 +-
 core/src/retransmit_stage.rs     | 32 ++++++++++++++++----------------
 core/src/tvu.rs                  |  8 ++++----
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/core/benches/retransmit_stage.rs b/core/benches/retransmit_stage.rs
index 65b2f8952..fbe842af7 100644
--- a/core/benches/retransmit_stage.rs
+++ b/core/benches/retransmit_stage.rs
@@ -107,7 +107,7 @@ fn bench_retransmitter(bencher: &mut Bencher) {
     let retransmitter_handles = retransmitter(
         Arc::new(sockets),
         bank_forks,
-        &leader_schedule_cache,
+        leader_schedule_cache,
         cluster_info,
         packet_receiver,
         Arc::default(), // solana_rpc::max_slots::MaxSlots
diff --git a/core/src/retransmit_stage.rs b/core/src/retransmit_stage.rs
index 26dd09e2d..36aed021a 100644
--- a/core/src/retransmit_stage.rs
+++ b/core/src/retransmit_stage.rs
@@ -241,7 +241,7 @@ fn retransmit(
     shreds_received: &Mutex<ShredFilterAndHasher>,
     max_slots: &MaxSlots,
     first_shreds_received: &Mutex<BTreeSet<Slot>>,
-    rpc_subscriptions: &Option<Arc<RpcSubscriptions>>,
+    rpc_subscriptions: Option<&RpcSubscriptions>,
 ) -> Result<()> {
     const RECV_TIMEOUT: Duration = Duration::from_secs(1);
     let r_lock = r.lock().unwrap();
@@ -380,7 +380,7 @@ fn retransmit(
 pub fn retransmitter(
     sockets: Arc<Vec<UdpSocket>>,
     bank_forks: Arc<RwLock<BankForks>>,
-    leader_schedule_cache: &Arc<LeaderScheduleCache>,
+    leader_schedule_cache: Arc<LeaderScheduleCache>,
     cluster_info: Arc<ClusterInfo>,
     r: Arc<Mutex<PacketReceiver>>,
     max_slots: Arc<MaxSlots>,
@@ -430,7 +430,7 @@ pub fn retransmitter(
                             &shreds_received,
                             &max_slots,
                             &first_shreds_received,
-                            &rpc_subscriptions,
+                            rpc_subscriptions.as_deref(),
                         ) {
                             match e {
                                 Error::RecvTimeout(RecvTimeoutError::Disconnected) => break,
@@ -448,7 +448,7 @@ pub fn retransmitter(
         .collect()
 }
 
-pub struct RetransmitStage {
+pub(crate) struct RetransmitStage {
     thread_hdls: Vec<JoinHandle<()>>,
     window_service: WindowService,
     cluster_slots_service: ClusterSlotsService,
@@ -457,15 +457,15 @@ pub struct RetransmitStage {
 impl RetransmitStage {
     #[allow(clippy::new_ret_no_self)]
     #[allow(clippy::too_many_arguments)]
-    pub fn new(
+    pub(crate) fn new(
         bank_forks: Arc<RwLock<BankForks>>,
-        leader_schedule_cache: &Arc<LeaderScheduleCache>,
+        leader_schedule_cache: Arc<LeaderScheduleCache>,
         blockstore: Arc<Blockstore>,
-        cluster_info: &Arc<ClusterInfo>,
+        cluster_info: Arc<ClusterInfo>,
         retransmit_sockets: Arc<Vec<UdpSocket>>,
         repair_socket: Arc<UdpSocket>,
         verified_receiver: Receiver<Vec<Packets>>,
-        exit: &Arc<AtomicBool>,
+        exit: Arc<AtomicBool>,
         cluster_slots_update_receiver: ClusterSlotsUpdateReceiver,
         epoch_schedule: EpochSchedule,
         cfg: Option<Arc<AtomicBool>>,
@@ -475,7 +475,7 @@ impl RetransmitStage {
         verified_vote_receiver: VerifiedVoteReceiver,
         repair_validators: Option<HashSet<Pubkey>>,
         completed_data_sets_sender: CompletedDataSetsSender,
-        max_slots: &Arc<MaxSlots>,
+        max_slots: Arc<MaxSlots>,
         rpc_subscriptions: Option<Arc<RpcSubscriptions>>,
         duplicate_slots_sender: Sender<Slot>,
         ancestor_hashes_replay_update_receiver: AncestorHashesReplayUpdateReceiver,
@@ -486,10 +486,10 @@ impl RetransmitStage {
         let thread_hdls = retransmitter(
             retransmit_sockets,
             bank_forks.clone(),
-            leader_schedule_cache,
+            leader_schedule_cache.clone(),
             cluster_info.clone(),
             retransmit_receiver,
-            Arc::clone(max_slots),
+            max_slots,
             rpc_subscriptions,
         );
 
@@ -508,7 +508,7 @@ impl RetransmitStage {
             epoch_schedule,
             duplicate_slots_reset_sender,
             repair_validators,
-            cluster_info: cluster_info.clone(),
+            cluster_info,
             cluster_slots,
         };
         let window_service = WindowService::new(
@@ -516,9 +516,9 @@ impl RetransmitStage {
             verified_receiver,
             retransmit_sender,
             repair_socket,
-            exit.clone(),
+            exit,
             repair_info,
-            leader_schedule_cache.clone(),
+            leader_schedule_cache,
             move |id, shred, working_bank, last_root| {
                 let is_connected = cfg
                     .as_ref()
@@ -547,7 +547,7 @@ impl RetransmitStage {
         }
     }
 
-    pub fn join(self) -> thread::Result<()> {
+    pub(crate) fn join(self) -> thread::Result<()> {
         for thread_hdl in self.thread_hdls {
             thread_hdl.join()?;
         }
@@ -620,7 +620,7 @@ mod tests {
         let _t_retransmit = retransmitter(
             retransmit_socket,
             bank_forks,
-            &leader_schedule_cache,
+            leader_schedule_cache,
             cluster_info,
             Arc::new(Mutex::new(retransmit_receiver)),
             Arc::default(), // MaxSlots
diff --git a/core/src/tvu.rs b/core/src/tvu.rs
index 3c0ffbd1e..9e1737d3f 100644
--- a/core/src/tvu.rs
+++ b/core/src/tvu.rs
@@ -175,13 +175,13 @@ impl Tvu {
             unbounded();
         let retransmit_stage = RetransmitStage::new(
             bank_forks.clone(),
-            leader_schedule_cache,
+            leader_schedule_cache.clone(),
             blockstore.clone(),
-            cluster_info,
+            cluster_info.clone(),
             Arc::new(retransmit_sockets),
             repair_socket,
             verified_receiver,
-            exit,
+            exit.clone(),
             cluster_slots_update_receiver,
             *bank_forks.read().unwrap().working_bank().epoch_schedule(),
             cfg,
@@ -191,7 +191,7 @@ impl Tvu {
             verified_vote_receiver,
             tvu_config.repair_validators,
             completed_data_sets_sender,
-            max_slots,
+            max_slots.clone(),
             Some(rpc_subscriptions.clone()),
             duplicate_slots_sender,
             ancestor_hashes_replay_update_receiver,