From 1f91a90a5311232e3d469469807fb02fabc21610 Mon Sep 17 00:00:00 2001 From: Tao Zhu <82401714+taozhu-chicago@users.noreply.github.com> Date: Sun, 7 May 2023 10:56:24 -0500 Subject: [PATCH] Refactor remove unnecessary parameter (#31520) Refactor: remove unnecessary parameter from DeserializedPacket constructor --- core/src/immutable_deserialized_packet.rs | 11 ++++------- core/src/latest_unprocessed_votes.rs | 2 +- core/src/packet_deserializer.rs | 2 +- core/src/unprocessed_packet_batches.rs | 10 +--------- core/src/unprocessed_transaction_storage.rs | 12 ++++++------ 5 files changed, 13 insertions(+), 24 deletions(-) diff --git a/core/src/immutable_deserialized_packet.rs b/core/src/immutable_deserialized_packet.rs index 996d3d588..eca2def5b 100644 --- a/core/src/immutable_deserialized_packet.rs +++ b/core/src/immutable_deserialized_packet.rs @@ -46,10 +46,7 @@ pub struct ImmutableDeserializedPacket { } impl ImmutableDeserializedPacket { - pub fn new( - packet: Packet, - priority_details: Option, - ) -> Result { + pub fn new(packet: Packet) -> Result { let versioned_transaction: VersionedTransaction = packet.deserialize_slice(..)?; let sanitized_transaction = SanitizedVersionedTransaction::try_from(versioned_transaction)?; let message_bytes = packet_message(&packet)?; @@ -57,8 +54,8 @@ impl ImmutableDeserializedPacket { let is_simple_vote = packet.meta().is_simple_vote_tx(); // drop transaction if prioritization fails. - let mut priority_details = priority_details - .or_else(|| sanitized_transaction.get_transaction_priority_details()) + let mut priority_details = sanitized_transaction + .get_transaction_priority_details() .ok_or(DeserializedPacketError::PrioritizationFailure)?; // set priority to zero for vote transactions @@ -163,7 +160,7 @@ mod tests { Hash::new_unique(), ); let packet = Packet::from_data(None, tx).unwrap(); - let deserialized_packet = ImmutableDeserializedPacket::new(packet, None); + let deserialized_packet = ImmutableDeserializedPacket::new(packet); assert!(matches!(deserialized_packet, Ok(_))); } diff --git a/core/src/latest_unprocessed_votes.rs b/core/src/latest_unprocessed_votes.rs index af5744461..3805777a6 100644 --- a/core/src/latest_unprocessed_votes.rs +++ b/core/src/latest_unprocessed_votes.rs @@ -38,7 +38,7 @@ impl LatestValidatorVotePacket { return Err(DeserializedPacketError::VoteTransactionError); } - let vote = Arc::new(ImmutableDeserializedPacket::new(packet, None)?); + let vote = Arc::new(ImmutableDeserializedPacket::new(packet)?); Self::new_from_immutable(vote, vote_source) } diff --git a/core/src/packet_deserializer.rs b/core/src/packet_deserializer.rs index cfa680982..1326db5bc 100644 --- a/core/src/packet_deserializer.rs +++ b/core/src/packet_deserializer.rs @@ -138,7 +138,7 @@ impl PacketDeserializer { packet_indexes: &'a [usize], ) -> impl Iterator + 'a { packet_indexes.iter().filter_map(move |packet_index| { - ImmutableDeserializedPacket::new(packet_batch[*packet_index].clone(), None).ok() + ImmutableDeserializedPacket::new(packet_batch[*packet_index].clone()).ok() }) } } diff --git a/core/src/unprocessed_packet_batches.rs b/core/src/unprocessed_packet_batches.rs index eaeb8093d..2878e599f 100644 --- a/core/src/unprocessed_packet_batches.rs +++ b/core/src/unprocessed_packet_batches.rs @@ -2,7 +2,6 @@ use { crate::immutable_deserialized_packet::{DeserializedPacketError, ImmutableDeserializedPacket}, min_max_heap::MinMaxHeap, solana_perf::packet::{Packet, PacketBatch}, - solana_runtime::transaction_priority_details::TransactionPriorityDetails, solana_sdk::{hash::Hash, transaction::Transaction}, std::{ cmp::Ordering, @@ -28,14 +27,7 @@ impl DeserializedPacket { } pub fn new(packet: Packet) -> Result { - Self::new_internal(packet, None) - } - - pub fn new_internal( - packet: Packet, - priority_details: Option, - ) -> Result { - let immutable_section = ImmutableDeserializedPacket::new(packet, priority_details)?; + let immutable_section = ImmutableDeserializedPacket::new(packet)?; Ok(Self { immutable_section: Arc::new(immutable_section), diff --git a/core/src/unprocessed_transaction_storage.rs b/core/src/unprocessed_transaction_storage.rs index ff369d59a..cf7f3754f 100644 --- a/core/src/unprocessed_transaction_storage.rs +++ b/core/src/unprocessed_transaction_storage.rs @@ -1194,9 +1194,9 @@ mod tests { thread_type, ); transaction_storage.insert_batch(vec![ - ImmutableDeserializedPacket::new(small_transfer.clone(), None)?, - ImmutableDeserializedPacket::new(vote.clone(), None)?, - ImmutableDeserializedPacket::new(big_transfer.clone(), None)?, + ImmutableDeserializedPacket::new(small_transfer.clone())?, + ImmutableDeserializedPacket::new(vote.clone())?, + ImmutableDeserializedPacket::new(big_transfer.clone())?, ]); let deserialized_packets = transaction_storage .iter() @@ -1214,9 +1214,9 @@ mod tests { vote_source, ); transaction_storage.insert_batch(vec![ - ImmutableDeserializedPacket::new(small_transfer.clone(), None)?, - ImmutableDeserializedPacket::new(vote.clone(), None)?, - ImmutableDeserializedPacket::new(big_transfer.clone(), None)?, + ImmutableDeserializedPacket::new(small_transfer.clone())?, + ImmutableDeserializedPacket::new(vote.clone())?, + ImmutableDeserializedPacket::new(big_transfer.clone())?, ]); assert_eq!(1, transaction_storage.len()); }