From 216880f55271314216d7ef5f75c0d051ae40463c Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Thu, 5 Jan 2023 11:59:20 -0700 Subject: [PATCH] Fix conflicts --- core/src/replay_stage.rs | 51 +++----------------------- core/src/tvu.rs | 19 ++-------- core/src/unprocessed_packet_batches.rs | 11 ++---- core/src/validator.rs | 6 +-- 4 files changed, 13 insertions(+), 74 deletions(-) diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs index 646cebaf44cba4..ba9158e1249194 100644 --- a/core/src/replay_stage.rs +++ b/core/src/replay_stage.rs @@ -398,12 +398,8 @@ impl ReplayStage { drop_bank_sender: Sender>>, block_metadata_notifier: Option, log_messages_bytes_limit: Option, -<<<<<<< HEAD - ) -> Self { -======= prioritization_fee_cache: Arc, - ) -> Result { ->>>>>>> 8bb039d08 (collect min prioritization fees when replaying sanitized transactions (#26709)) + ) -> Self { let mut tower = if let Some(process_blockstore) = maybe_process_blockstore { let tower = process_blockstore.process_to_create_tower(); info!("Tower state: {:?}", tower); @@ -536,6 +532,7 @@ impl ReplayStage { block_metadata_notifier.clone(), &mut replay_timing, log_messages_bytes_limit, + &prioritization_fee_cache, ); replay_active_banks_time.stop(); @@ -605,14 +602,6 @@ impl ReplayStage { &mut heaviest_subtree_fork_choice, &mut duplicate_slots_to_repair, &ancestor_hashes_replay_update_sender, -<<<<<<< HEAD -======= - block_metadata_notifier.clone(), - &mut replay_timing, - log_messages_bytes_limit, - replay_slots_concurrently, - &prioritization_fee_cache, ->>>>>>> 8bb039d08 (collect min prioritization fees when replaying sanitized transactions (#26709)) ); } process_duplicate_slots_time.stop(); @@ -2676,13 +2665,8 @@ impl ReplayStage { block_metadata_notifier: Option, replay_timing: &mut ReplayTiming, log_messages_bytes_limit: Option, -<<<<<<< HEAD - ) -> bool { -======= - replay_slots_concurrently: bool, prioritization_fee_cache: &PrioritizationFeeCache, - ) -> bool /* completed a bank */ { ->>>>>>> 8bb039d08 (collect min prioritization fees when replaying sanitized transactions (#26709)) + ) -> bool { let active_bank_slots = bank_forks.read().unwrap().active_bank_slots(); let num_active_banks = active_bank_slots.len(); trace!( @@ -2711,6 +2695,7 @@ impl ReplayStage { replay_timing, log_messages_bytes_limit, &active_bank_slots, + prioritization_fee_cache, ) } else { active_bank_slots @@ -2728,6 +2713,7 @@ impl ReplayStage { replay_timing, log_messages_bytes_limit, *bank_slot, + prioritization_fee_cache, ) }) .collect() @@ -2744,34 +2730,9 @@ impl ReplayStage { replay_vote_sender, replay_timing, log_messages_bytes_limit, -<<<<<<< HEAD active_bank_slots[0], - )] -======= - &active_bank_slots, prioritization_fee_cache, - ) - } else { - active_bank_slots - .iter() - .map(|bank_slot| { - Self::replay_active_bank( - blockstore, - bank_forks, - my_pubkey, - vote_account, - progress, - transaction_status_sender, - verify_recyclers, - replay_vote_sender, - replay_timing, - log_messages_bytes_limit, - *bank_slot, - prioritization_fee_cache, - ) - }) - .collect() ->>>>>>> 8bb039d08 (collect min prioritization fees when replaying sanitized transactions (#26709)) + )] }; Self::process_replay_results( diff --git a/core/src/tvu.rs b/core/src/tvu.rs index c0ff81cb95ac04..4ec82901447b99 100644 --- a/core/src/tvu.rs +++ b/core/src/tvu.rs @@ -129,12 +129,8 @@ impl Tvu { accounts_background_request_sender: AbsRequestSender, log_messages_bytes_limit: Option, connection_cache: &Arc, -<<<<<<< HEAD - ) -> Self { -======= prioritization_fee_cache: &Arc, - ) -> Result { ->>>>>>> 8bb039d08 (collect min prioritization fees when replaying sanitized transactions (#26709)) + ) -> Self { let TvuSockets { repair: repair_socket, fetch: fetch_sockets, @@ -293,12 +289,8 @@ impl Tvu { drop_bank_sender, block_metadata_notifier, log_messages_bytes_limit, -<<<<<<< HEAD - ); -======= prioritization_fee_cache.clone(), - )?; ->>>>>>> 8bb039d08 (collect min prioritization fees when replaying sanitized transactions (#26709)) + ); let ledger_cleanup_service = tvu_config.max_ledger_shreds.map(|max_ledger_shreds| { LedgerCleanupService::new( @@ -461,13 +453,8 @@ pub mod tests { AbsRequestSender::default(), None, &Arc::new(ConnectionCache::default()), -<<<<<<< HEAD - ); -======= &_ignored_prioritization_fee_cache, - ) - .expect("assume success"); ->>>>>>> 8bb039d08 (collect min prioritization fees when replaying sanitized transactions (#26709)) + ); exit.store(true, Ordering::Relaxed); tvu.join().unwrap(); poh_service.join().unwrap(); diff --git a/core/src/unprocessed_packet_batches.rs b/core/src/unprocessed_packet_batches.rs index 5d60e3a0550fd9..c732a9e2052380 100644 --- a/core/src/unprocessed_packet_batches.rs +++ b/core/src/unprocessed_packet_batches.rs @@ -1,14 +1,9 @@ use { -<<<<<<< HEAD - crate::transaction_priority_details::{ - GetTransactionPriorityDetails, TransactionPriorityDetails, - }, -======= - crate::immutable_deserialized_packet::{DeserializedPacketError, ImmutableDeserializedPacket}, ->>>>>>> 8bb039d08 (collect min prioritization fees when replaying sanitized transactions (#26709)) min_max_heap::MinMaxHeap, solana_perf::packet::{Packet, PacketBatch}, - solana_runtime::transaction_priority_details::TransactionPriorityDetails, + solana_runtime::transaction_priority_details::{ + GetTransactionPriorityDetails, TransactionPriorityDetails, + }, solana_sdk::{ feature_set, hash::Hash, diff --git a/core/src/validator.rs b/core/src/validator.rs index bb0832335762d5..818e835d435ac9 100644 --- a/core/src/validator.rs +++ b/core/src/validator.rs @@ -1020,12 +1020,8 @@ impl Validator { accounts_background_request_sender, config.runtime_config.log_messages_bytes_limit, &connection_cache, -<<<<<<< HEAD - ); -======= &prioritization_fee_cache, - )?; ->>>>>>> 8bb039d08 (collect min prioritization fees when replaying sanitized transactions (#26709)) + ); let tpu = Tpu::new( &cluster_info,