Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qs: undo using block votes to fetch batches #15786

Merged
merged 1 commit into from
Jan 22, 2025
Merged

qs: undo using block votes to fetch batches #15786

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions consensus/src/block_preparer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,13 @@ impl BlockPreparer {
});
let start_time = Instant::now();

let (txns, max_txns_from_block_to_execute) = tokio::select! {
// Poll the block qc future until a QC is received. Ignore None outcomes.
Some(qc) = block_qc_fut => {
let block_voters = Some(qc.ledger_info().get_voters_bitvec().clone());
self.payload_manager.get_transactions(block, block_voters).await
},
result = self.payload_manager.get_transactions(block, None) => {
result
}
}?;
let block_voters = block_qc_fut
.await
.map(|qc| qc.ledger_info().get_voters_bitvec().clone());
let (txns, max_txns_from_block_to_execute) = self
.payload_manager
.get_transactions(block, block_voters)
.await?;
let txn_filter = self.txn_filter.clone();
let txn_deduper = self.txn_deduper.clone();
let txn_shuffler = self.txn_shuffler.clone();
Expand Down
Loading