Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Fix merge issues: Arc::clone and ConnectionCache construction #31825

Merged
apfitzge merged 1 commit into from
May 25, 2023
Merged

Fix merge issues: Arc::clone and ConnectionCache construction #31825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/src/banking_stage/consume_worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion core/src/banking_stage/forward_worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -157,7 +158,7 @@ mod tests {
poh_recorder,
bank_forks,
cluster_info,
Arc::default(),
Arc::new(ConnectionCache::new("test")),
Copy link
Copy Markdown
Contributor

@behzadnouri behzadnouri May 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have been connection_cache_test as in other cases in #31803

Arc::default(),
);

Expand Down