blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Andrew Fitzgerald 2023-05-25 11:30:05 -07:00 committed by GitHub
parent 89fd848e6c
commit 5fde26fe6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/banking_stage/consume_worker.rs
View File

@ -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();

3
core/src/banking_stage/forward_worker.rs
View File

@ -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(),
);