Skip to content

Commit de54ce0

Browse files
jstarryjstarry
authored
clean up formatting of tx scheduler (#6420)
1 parent 2c08c33 commit de54ce0

File tree

6 files changed

+39
-36
lines changed

6 files changed

+39
-36
lines changed

‎core/src/banking_stage/transaction_scheduler/greedy_scheduler.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,12 +282,12 @@ mod test {
282282
},
283283
crossbeam_channel::unbounded,
284284
itertools::Itertools,
285-
solana_pubkey::Pubkey,
286-
solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
287285
solana_compute_budget_interface::ComputeBudgetInstruction,
288286
solana_hash::Hash,
289-
solana_message::Message,
290287
solana_keypair::Keypair,
288+
solana_message::Message,
289+
solana_pubkey::Pubkey,
290+
solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
291291
solana_signer::Signer,
292292
solana_system_interface::instruction as system_instruction,
293293
solana_transaction::{sanitized::SanitizedTransaction, Transaction},

‎core/src/banking_stage/transaction_scheduler/prio_graph_scheduler.rs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ use {
2424
prio_graph::{AccessKind, GraphNode, PrioGraph},
2525
solana_cost_model::block_cost_limits::MAX_BLOCK_UNITS,
2626
solana_measure::measure_us,
27-
solana_runtime_transaction::transaction_with_meta::TransactionWithMeta,
2827
solana_pubkey::Pubkey,
28+
solana_runtime_transaction::transaction_with_meta::TransactionWithMeta,
2929
solana_svm_transaction::svm_message::SVMMessage,
3030
std::num::Saturating,
3131
};
@@ -265,10 +265,10 @@ impl<Tx: TransactionWithMeta> Scheduler<Tx> for PrioGraphScheduler<Tx> {
265265
>= self.config.target_transactions_per_batch
266266
{
267267
num_sent += self.common.send_batch(
268-
&mut batches,
269-
thread_id,
270-
self.config.target_transactions_per_batch,
271-
)?;
268+
&mut batches,
269+
thread_id,
270+
self.config.target_transactions_per_batch,
271+
)?;
272272
}
273273

274274
// if the thread is at max_cu_per_thread, remove it from the schedulable threads
@@ -291,7 +291,8 @@ impl<Tx: TransactionWithMeta> Scheduler<Tx> for PrioGraphScheduler<Tx> {
291291
}
292292

293293
// Send all non-empty batches
294-
num_sent += self.common
294+
num_sent += self
295+
.common
295296
.send_batches(&mut batches, self.config.target_transactions_per_batch)?;
296297

297298
// Refresh window budget and do chunked pops
@@ -305,7 +306,8 @@ impl<Tx: TransactionWithMeta> Scheduler<Tx> for PrioGraphScheduler<Tx> {
305306
}
306307

307308
// Send batches for any remaining transactions
308-
num_sent += self.common
309+
num_sent += self
310+
.common
309311
.send_batches(&mut batches, self.config.target_transactions_per_batch)?;
310312

311313
// Push unschedulable ids back into the container
@@ -433,12 +435,12 @@ mod tests {
433435
},
434436
crossbeam_channel::{unbounded, Receiver},
435437
itertools::Itertools,
436-
solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
437438
solana_compute_budget_interface::ComputeBudgetInstruction,
438439
solana_hash::Hash,
440+
solana_keypair::Keypair,
439441
solana_message::Message,
440442
solana_pubkey::Pubkey,
441-
solana_keypair::Keypair,
443+
solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
442444
solana_signer::Signer,
443445
solana_system_interface::instruction as system_instruction,
444446
solana_transaction::{sanitized::SanitizedTransaction, Transaction},

‎core/src/banking_stage/transaction_scheduler/receive_and_buffer.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ use {
2525
core::time::Duration,
2626
crossbeam_channel::{RecvTimeoutError, TryRecvError},
2727
solana_accounts_db::account_locks::validate_account_locks,
28+
solana_address_lookup_table_interface::state::estimate_last_valid_slot,
29+
solana_clock::{Epoch, Slot, MAX_PROCESSING_AGE},
2830
solana_cost_model::cost_model::CostModel,
31+
solana_fee_structure::FeeBudgetLimits,
2932
solana_measure::measure_us,
3033
solana_runtime::{bank::Bank, bank_forks::BankForks},
3134
solana_runtime_transaction::{
3235
runtime_transaction::RuntimeTransaction, transaction_meta::StaticMeta,
3336
transaction_with_meta::TransactionWithMeta,
3437
},
35-
solana_address_lookup_table_interface::state::estimate_last_valid_slot,
36-
solana_clock::{Epoch, Slot, MAX_PROCESSING_AGE},
37-
solana_fee_structure::FeeBudgetLimits,
38-
solana_transaction::sanitized::{MessageHash, SanitizedTransaction},
3938
solana_svm::transaction_error_metrics::TransactionErrorMetrics,
4039
solana_svm_transaction::svm_message::SVMMessage,
40+
solana_transaction::sanitized::{MessageHash, SanitizedTransaction},
4141
std::{
4242
num::Saturating,
4343
sync::{Arc, RwLock},
@@ -264,7 +264,8 @@ impl SanitizedTransactionReceiveAndBuffer {
264264
count_metrics.num_buffered += num_buffered;
265265
count_metrics.num_dropped_on_sanitization += num_dropped_on_sanitization;
266266
count_metrics.num_dropped_on_validate_locks += num_dropped_on_lock_validation;
267-
count_metrics.num_dropped_on_receive_transaction_checks += num_dropped_on_transaction_checks;
267+
count_metrics.num_dropped_on_receive_transaction_checks +=
268+
num_dropped_on_transaction_checks;
268269
});
269270
}
270271
}
@@ -661,13 +662,13 @@ mod tests {
661662
super::*,
662663
crate::banking_stage::tests::create_slow_genesis_config,
663664
crossbeam_channel::{unbounded, Receiver},
664-
solana_ledger::genesis_utils::GenesisConfigInfo,
665-
solana_perf::packet::{to_packet_batches, Packet, PacketBatch, PinnedPacketBatch},
666-
solana_pubkey::Pubkey,
667665
solana_hash::Hash,
666+
solana_keypair::Keypair,
667+
solana_ledger::genesis_utils::GenesisConfigInfo,
668668
solana_message::{v0, AddressLookupTableAccount, VersionedMessage},
669669
solana_packet::{Meta, PACKET_DATA_SIZE},
670-
solana_keypair::Keypair,
670+
solana_perf::packet::{to_packet_batches, Packet, PacketBatch, PinnedPacketBatch},
671+
solana_pubkey::Pubkey,
671672
solana_signer::Signer,
672673
solana_system_interface::instruction as system_instruction,
673674
solana_system_transaction::transfer,
@@ -749,8 +750,7 @@ mod tests {
749750
calculate_max_age(sanitized_epoch, current_slot - 1, current_slot),
750751
MaxAge {
751752
sanitized_epoch,
752-
alt_invalidation_slot: current_slot - 1
753-
+ solana_slot_hashes::get_entries() as u64,
753+
alt_invalidation_slot: current_slot - 1 + solana_slot_hashes::get_entries() as u64,
754754
}
755755
);
756756

‎core/src/banking_stage/transaction_scheduler/scheduler_common.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -282,12 +282,10 @@ mod tests {
282282
use {
283283
super::*,
284284
crate::banking_stage::transaction_scheduler::transaction_state_container::TransactionStateContainer,
285-
crossbeam_channel::unbounded,
286-
solana_keypair::Keypair,
287-
solana_pubkey::Pubkey,
288-
solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
289-
solana_hash::Hash, solana_system_transaction as system_transaction, solana_transaction::sanitized::SanitizedTransaction,
290-
test_case::test_case,
285+
crossbeam_channel::unbounded, solana_hash::Hash, solana_keypair::Keypair,
286+
solana_pubkey::Pubkey, solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
287+
solana_system_transaction as system_transaction,
288+
solana_transaction::sanitized::SanitizedTransaction, test_case::test_case,
291289
};
292290

293291
const NUM_WORKERS: usize = 4;

‎core/src/banking_stage/transaction_scheduler/transaction_state.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ impl<Tx> TransactionState<Tx> {
8888
mod tests {
8989
use {
9090
super::*,
91-
solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
9291
solana_compute_budget_interface::ComputeBudgetInstruction,
9392
solana_hash::Hash,
94-
solana_message::Message,
9593
solana_keypair::Keypair,
94+
solana_message::Message,
95+
solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
9696
solana_signer::Signer,
9797
solana_system_interface::instruction as system_instruction,
9898
solana_transaction::{sanitized::SanitizedTransaction, Transaction},

‎core/src/banking_stage/transaction_scheduler/transaction_state_container.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ use {
77
itertools::MinMaxResult,
88
min_max_heap::MinMaxHeap,
99
slab::{Slab, VacantEntry},
10+
solana_packet::PACKET_DATA_SIZE,
1011
solana_runtime_transaction::{
1112
runtime_transaction::RuntimeTransaction, transaction_with_meta::TransactionWithMeta,
1213
},
13-
solana_packet::PACKET_DATA_SIZE,
1414
std::sync::Arc,
1515
};
1616

@@ -346,15 +346,18 @@ mod tests {
346346
super::*,
347347
crate::banking_stage::scheduler_messages::MaxAge,
348348
agave_transaction_view::transaction_view::SanitizedTransactionView,
349-
solana_perf::packet::Packet,
350-
solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
351349
solana_compute_budget_interface::ComputeBudgetInstruction,
352350
solana_hash::Hash,
353-
solana_message::Message,
354351
solana_keypair::Keypair,
352+
solana_message::Message,
353+
solana_perf::packet::Packet,
354+
solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
355355
solana_signer::Signer,
356356
solana_system_interface::instruction as system_instruction,
357-
solana_transaction::{sanitized::{MessageHash, SanitizedTransaction}, Transaction},
357+
solana_transaction::{
358+
sanitized::{MessageHash, SanitizedTransaction},
359+
Transaction,
360+
},
358361
std::collections::HashSet,
359362
};
360363

0 commit comments

Comments
 (0)