| 
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 |  | -    solana_core::banking_stage::{  | 
11 |  | -        committer::Committer, consumer::Consumer, qos_service::QosService,  | 
12 |  | -    },  | 
 | 10 | +    solana_core::banking_stage::consumer::Consumer,  | 
13 | 11 |     solana_entry::entry::Entry,  | 
14 | 12 |     solana_ledger::{  | 
15 | 13 |         blockstore::Blockstore,  | 
@@ -81,13 +79,6 @@ fn create_transactions(bank: &Bank, num: usize) -> Vec<RuntimeTransaction<Saniti  | 
81 | 79 |         .collect()  | 
82 | 80 | }  | 
83 | 81 | 
 
  | 
84 |  | -fn create_consumer(poh_recorder: &RwLock<PohRecorder>) -> Consumer {  | 
85 |  | -    let (replay_vote_sender, _replay_vote_receiver) = unbounded();  | 
86 |  | -    let committer = Committer::new(None, replay_vote_sender, Arc::default());  | 
87 |  | -    let transaction_recorder = poh_recorder.read().unwrap().new_recorder();  | 
88 |  | -    Consumer::new(committer, transaction_recorder, QosService::new(0), None)  | 
89 |  | -}  | 
90 |  | - | 
91 | 82 | struct BenchFrame {  | 
92 | 83 |     bank: Arc<Bank>,  | 
93 | 84 |     _bank_forks: Arc<RwLock<BankForks>>,  | 
@@ -156,7 +147,7 @@ fn bench_process_and_record_transactions(bencher: &mut Bencher, batch_size: usiz  | 
156 | 147 |         poh_service,  | 
157 | 148 |         signal_receiver: _signal_receiver,  | 
158 | 149 |     } = setup();  | 
159 |  | -    let consumer = create_consumer(&poh_recorder);  | 
 | 150 | +    let consumer = Consumer::from(&*poh_recorder);  | 
160 | 151 |     let transactions = create_transactions(&bank, 2_usize.pow(20));  | 
161 | 152 |     let mut transaction_iter = transactions.chunks(batch_size);  | 
162 | 153 | 
 
  | 
 | 
0 commit comments