|
2 | 2 | #![feature(test)] |
3 | 3 |
|
4 | 4 | use { |
5 | | - crossbeam_channel::{unbounded, Receiver}, |
| 5 | + crossbeam_channel::Receiver, |
6 | 6 | rayon::{ |
7 | 7 | iter::IndexedParallelIterator, |
8 | 8 | prelude::{IntoParallelIterator, IntoParallelRefIterator, ParallelIterator}, |
9 | 9 | }, |
10 | 10 | solana_account::{Account, ReadableAccount}, |
11 | 11 | solana_clock::Epoch, |
12 | | - solana_core::banking_stage::{ |
13 | | - committer::Committer, consumer::Consumer, qos_service::QosService, |
14 | | - }, |
| 12 | + solana_core::banking_stage::consumer::Consumer, |
15 | 13 | solana_entry::entry::Entry, |
16 | 14 | solana_keypair::Keypair, |
17 | 15 | solana_ledger::{ |
@@ -80,12 +78,6 @@ fn create_transactions(bank: &Bank, num: usize) -> Vec<RuntimeTransaction<Saniti |
80 | 78 | .collect() |
81 | 79 | } |
82 | 80 |
|
83 | | -fn create_consumer(transaction_recorder: TransactionRecorder) -> Consumer { |
84 | | - let (replay_vote_sender, _replay_vote_receiver) = unbounded(); |
85 | | - let committer = Committer::new(None, replay_vote_sender, Arc::default()); |
86 | | - Consumer::new(committer, transaction_recorder, QosService::new(0), None) |
87 | | -} |
88 | | - |
89 | 81 | struct BenchFrame { |
90 | 82 | bank: Arc<Bank>, |
91 | 83 | _bank_forks: Arc<RwLock<BankForks>>, |
@@ -154,7 +146,7 @@ fn bench_process_and_record_transactions(bencher: &mut Bencher, batch_size: usiz |
154 | 146 | poh_service, |
155 | 147 | signal_receiver: _signal_receiver, |
156 | 148 | } = setup(); |
157 | | - let consumer = create_consumer(transaction_recorder); |
| 149 | + let consumer = Consumer::from(&transaction_recorder); |
158 | 150 | let transactions = create_transactions(&bank, 2_usize.pow(20)); |
159 | 151 | let mut transaction_iter = transactions.chunks(batch_size); |
160 | 152 |
|
|
0 commit comments