Skip to content

Commit 9f8e6d7

Browse files
carllinbw-solana
authored andcommitted
Add basic skeleton of certificate tracking (anza-xyz#36)
Fix master errors (anza-xyz#52)
1 parent dc1c2b1 commit 9f8e6d7

File tree

18 files changed

+2908
-132
lines changed

18 files changed

+2908
-132
lines changed

core/benches/consumer.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
#![feature(test)]
33

44
use {
5-
crossbeam_channel::{unbounded, Receiver},
5+
crossbeam_channel::Receiver,
66
rayon::{
77
iter::IndexedParallelIterator,
88
prelude::{IntoParallelIterator, IntoParallelRefIterator, ParallelIterator},
99
},
10-
solana_core::banking_stage::{
11-
committer::Committer, consumer::Consumer, qos_service::QosService,
12-
},
10+
solana_core::banking_stage::consumer::Consumer,
1311
solana_entry::entry::Entry,
1412
solana_ledger::{
1513
blockstore::Blockstore,
@@ -81,13 +79,6 @@ fn create_transactions(bank: &Bank, num: usize) -> Vec<RuntimeTransaction<Saniti
8179
.collect()
8280
}
8381

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-
9182
struct BenchFrame {
9283
bank: Arc<Bank>,
9384
_bank_forks: Arc<RwLock<BankForks>>,
@@ -156,7 +147,7 @@ fn bench_process_and_record_transactions(bencher: &mut Bencher, batch_size: usiz
156147
poh_service,
157148
signal_receiver: _signal_receiver,
158149
} = setup();
159-
let consumer = create_consumer(&poh_recorder);
150+
let consumer = Consumer::from(&*poh_recorder);
160151
let transactions = create_transactions(&bank, 2_usize.pow(20));
161152
let mut transaction_iter = transactions.chunks(batch_size);
162153

core/src/alpenglow_consensus.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
pub mod certificate_pool;
2+
pub mod skip_pool;
3+
pub mod vote_certificate;
4+
pub mod vote_history;
5+
pub mod vote_history_storage;
6+
7+
pub type Stake = u64;
8+
pub const SUPERMAJORITY: f64 = 2f64 / 3f64;

0 commit comments

Comments
 (0)