From c826fc9958161c3a7a15de01f4291b9c9ce600ed Mon Sep 17 00:00:00 2001 From: Ashwin Sekar Date: Fri, 12 Jul 2024 15:37:14 +0000 Subject: [PATCH] fix conflicts --- core/src/replay_stage.rs | 21 +++++---------------- ledger/src/blockstore_processor.rs | 4 ---- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs index b36a58a134f015..111fa02496d25f 100644 --- a/core/src/replay_stage.rs +++ b/core/src/replay_stage.rs @@ -8767,16 +8767,10 @@ pub(crate) mod tests { let bank_forks = BankForks::new_rw_arc(Bank::new_for_tests(&genesis_config)); let bank0 = bank_forks.read().unwrap().get_with_scheduler(0).unwrap(); let recyclers = VerifyRecyclers::default(); - let replay_tx_thread_pool = rayon::ThreadPoolBuilder::new() - .num_threads(1) - .thread_name(|i| format!("solReplayTx{i:02}")) - .build() - .expect("new rayon threadpool"); process_bank_0( &bank0, &blockstore, - &replay_tx_thread_pool, &ProcessOptions::default(), &recyclers, None, @@ -8797,7 +8791,6 @@ pub(crate) mod tests { confirm_full_slot( &blockstore, &bank1, - &replay_tx_thread_pool, &ProcessOptions::default(), &recyclers, &mut ConfirmationProgress::new(bank0.last_blockhash()), @@ -8808,15 +8801,11 @@ pub(crate) mod tests { ) .unwrap(); - bank_forks - .write() - .unwrap() - .set_root( - 1, - &solana_runtime::accounts_background_service::AbsRequestSender::default(), - None, - ) - .unwrap(); + bank_forks.write().unwrap().set_root( + 1, + &solana_runtime::accounts_background_service::AbsRequestSender::default(), + None, + ); let leader_schedule_cache = LeaderScheduleCache::new_from_bank(&bank1); diff --git a/ledger/src/blockstore_processor.rs b/ledger/src/blockstore_processor.rs index 079b7017feeecb..a625d505c64776 100644 --- a/ledger/src/blockstore_processor.rs +++ b/ledger/src/blockstore_processor.rs @@ -976,11 +976,7 @@ fn verify_ticks( Ok(()) } -<<<<<<< HEAD -======= -#[allow(clippy::too_many_arguments)] #[cfg_attr(feature = "dev-context-only-utils", qualifiers(pub))] ->>>>>>> 2a48564b59 (blockstore: only consume duplicate proofs from root_slot + 1 on startup (#1971)) fn confirm_full_slot( blockstore: &Blockstore, bank: &BankWithScheduler,