From 32e5c4e7311ce318de0c9bc63d02897fce59c78a Mon Sep 17 00:00:00 2001
From: Andrew Fitzgerald <apfitzge@gmail.com>
Date: Thu, 25 May 2023 18:20:24 +0000
Subject: [PATCH] Fix merge issues: Arc::clone and ConnectionCache construction

---
 core/src/banking_stage/consume_worker.rs | 6 +++---
 core/src/banking_stage/forward_worker.rs | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/banking_stage/consume_worker.rs b/core/src/banking_stage/consume_worker.rs
index dfc7a533e81ab5..856b5ad6f251cd 100644
--- a/core/src/banking_stage/consume_worker.rs
+++ b/core/src/banking_stage/consume_worker.rs
@@ -287,7 +287,7 @@ mod tests {
             ..
         } = &test_frame;
         let worker_thread = std::thread::spawn(move || worker.run());
-        poh_recorder.write().unwrap().set_bank(bank, false);
+        poh_recorder.write().unwrap().set_bank(bank.clone(), false);
 
         let pubkey1 = Pubkey::new_unique();
 
@@ -329,7 +329,7 @@ mod tests {
             ..
         } = &test_frame;
         let worker_thread = std::thread::spawn(move || worker.run());
-        poh_recorder.write().unwrap().set_bank(bank, false);
+        poh_recorder.write().unwrap().set_bank(bank.clone(), false);
 
         let pubkey1 = Pubkey::new_unique();
         let pubkey2 = Pubkey::new_unique();
@@ -374,7 +374,7 @@ mod tests {
             ..
         } = &test_frame;
         let worker_thread = std::thread::spawn(move || worker.run());
-        poh_recorder.write().unwrap().set_bank(bank, false);
+        poh_recorder.write().unwrap().set_bank(bank.clone(), false);
 
         let pubkey1 = Pubkey::new_unique();
         let pubkey2 = Pubkey::new_unique();
diff --git a/core/src/banking_stage/forward_worker.rs b/core/src/banking_stage/forward_worker.rs
index e171eb6b45b5f8..77c58574474f07 100644
--- a/core/src/banking_stage/forward_worker.rs
+++ b/core/src/banking_stage/forward_worker.rs
@@ -92,6 +92,7 @@ mod tests {
             immutable_deserialized_packet::ImmutableDeserializedPacket,
         },
         crossbeam_channel::unbounded,
+        solana_client::connection_cache::ConnectionCache,
         solana_ledger::{
             blockstore::Blockstore, genesis_utils::GenesisConfigInfo,
             get_tmp_ledger_path_auto_delete, leader_schedule_cache::LeaderScheduleCache,
@@ -157,7 +158,7 @@ mod tests {
             poh_recorder,
             bank_forks,
             cluster_info,
-            Arc::default(),
+            Arc::new(ConnectionCache::new("test")),
             Arc::default(),
         );