Skip to content

Commit ea67cf1

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

File tree

21 files changed

+3014
-118
lines changed

21 files changed

+3014
-118
lines changed

core/benches/consumer.rs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
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
},
1010
solana_account::{Account, ReadableAccount},
1111
solana_clock::Epoch,
12-
solana_core::banking_stage::{
13-
committer::Committer, consumer::Consumer, qos_service::QosService,
14-
},
12+
solana_core::banking_stage::consumer::Consumer,
1513
solana_entry::entry::Entry,
1614
solana_keypair::Keypair,
1715
solana_ledger::{
@@ -80,12 +78,6 @@ fn create_transactions(bank: &Bank, num: usize) -> Vec<RuntimeTransaction<Saniti
8078
.collect()
8179
}
8280

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-
8981
struct BenchFrame {
9082
bank: Arc<Bank>,
9183
_bank_forks: Arc<RwLock<BankForks>>,
@@ -154,7 +146,7 @@ fn bench_process_and_record_transactions(bencher: &mut Bencher, batch_size: usiz
154146
poh_service,
155147
signal_receiver: _signal_receiver,
156148
} = setup();
157-
let consumer = create_consumer(transaction_recorder);
149+
let consumer = Consumer::from(&transaction_recorder);
158150
let transactions = create_transactions(&bank, 2_usize.pow(20));
159151
let mut transaction_iter = transactions.chunks(batch_size);
160152

core/benches/receive_and_buffer_utils.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use {
3030
solana_signer::Signer,
3131
solana_transaction::versioned::VersionedTransaction,
3232
std::{
33-
sync::{Arc, RwLock},
33+
sync::{atomic::AtomicBool, Arc, RwLock},
3434
time::Instant,
3535
},
3636
};
@@ -194,6 +194,7 @@ pub fn setup_receive_and_buffer<T: ReceiveAndBuffer + ReceiveAndBufferCreator>(
194194
let bank_start = BankStart {
195195
working_bank: bank.clone(),
196196
bank_creation_time: Arc::new(Instant::now()),
197+
contains_valid_certificate: Arc::new(AtomicBool::new(false)),
197198
};
198199

199200
let (sender, receiver) = unbounded();

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)