fix comment

This commit is contained in:
al8n 2023-05-16 19:58:30 +08:00
parent 2bfb7acf80
commit 5fad6aad04
2 changed files with 5 additions and 18 deletions

View File

@ -9,14 +9,6 @@ use std::collections::HashMap;
pub type CarnotTx = [u8; 32];
#[derive(thiserror::Error, Debug)]
pub enum EventBuilderError {
#[error("block cannot be found: {0:?}")]
BlockNotFound(BlockId),
#[error("voter {voter:?} on view {view} has empty qc")]
EmptyQc { voter: NodeId, view: i64 },
}
#[derive(Default, Copy, Clone, Serialize, Deserialize)]
pub struct EventBuilderSettings {
pub votes_threshold: usize,
@ -42,7 +34,7 @@ impl EventBuilder {
}
}
pub fn step(&mut self, messages: Vec<CarnotMessage>) -> Result<Vec<Event<CarnotTx>>> {
pub fn step(&mut self, messages: Vec<CarnotMessage>) -> Vec<Event<CarnotTx>> {
let mut events = Vec::new();
for message in messages {
match message {
@ -60,10 +52,7 @@ impl EventBuilder {
CarnotMessage::Vote(msg) => {
let msg_view = msg.vote.view;
let block_id = msg.vote.block;
let qc = msg.qc.clone().ok_or(EventBuilderError::EmptyQc {
voter: msg.voter,
view: msg_view,
})?;
let qc = msg.qc.clone().expect("empty QC from vote message")?;
let entries = self
.vote_message
.entry(msg_view)
@ -78,7 +67,7 @@ impl EventBuilder {
block: self
.blocks
.get(&block_id)
.ok_or(EventBuilderError::BlockNotFound(block_id))?,
.expect(format!("cannot find block id {:?}", block_id).as_str())?,
votes: entry.into_iter().collect(),
})
}
@ -120,6 +109,6 @@ impl EventBuilder {
}
}
Ok(events)
events
}
}

View File

@ -13,9 +13,7 @@ use super::{Node, NodeId};
pub struct CarnotState {}
#[derive(Clone, Default, Deserialize)]
pub struct CarnotSettings {
pub event_builder_settings: EventBuilderSettings,
}
pub struct CarnotSettings {}
#[allow(dead_code)] // TODO: remove when handling settings
pub struct CarnotNode {