Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ opentelemetry = "0.28.0"
opentelemetry-otlp = "0.28.0"
opentelemetry_sdk = "0.28.0"
tracing-opentelemetry = "0.29.0"
rayon = "1.10.0"

[profile.bench]
# Because we enable overflow checks in "release," we should benchmark with them.
Expand Down
26 changes: 12 additions & 14 deletions consensus/src/simplex/mocks/conflicter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,25 +76,24 @@ impl<
.is_participant(view, &self.crypto.public_key())
.unwrap();

// Notarize received digest
let parent = notarize.proposal.parent;
// Notarize random digest
let payload = H::random(&mut self.context);
let proposal = Proposal::new(view, notarize.proposal.parent, payload);
let msg = Notarize::sign(
&self.namespace,
&mut self.crypto,
public_key_index,
notarize.proposal,
proposal,
);
let msg = Voter::Notarize(msg).encode().into();
sender.send(Recipients::All, msg, true).await.unwrap();

// Notarize random digest
let payload = H::random(&mut self.context);
let proposal = Proposal::new(view, parent, payload);
// Notarize received digest
let msg = Notarize::sign(
&self.namespace,
&mut self.crypto,
public_key_index,
proposal,
notarize.proposal,
);
let msg = Voter::Notarize(msg).encode().into();
sender.send(Recipients::All, msg, true).await.unwrap();
Expand All @@ -106,25 +105,24 @@ impl<
.is_participant(view, &self.crypto.public_key())
.unwrap();

// Finalize provided digest
let parent = finalize.proposal.parent;
// Finalize random digest
let payload = H::random(&mut self.context);
let proposal = Proposal::new(view, finalize.proposal.parent, payload);
let msg = Finalize::sign(
&self.namespace,
&mut self.crypto,
public_key_index,
finalize.proposal,
proposal,
);
let msg = Voter::Finalize(msg).encode().into();
sender.send(Recipients::All, msg, true).await.unwrap();

// Finalize random digest
let payload = H::random(&mut self.context);
let proposal = Proposal::new(view, parent, payload);
// Finalize provided digest
let msg = Finalize::sign(
&self.namespace,
&mut self.crypto,
public_key_index,
proposal,
finalize.proposal,
);
let msg = Voter::Finalize(msg).encode().into();
sender.send(Recipients::All, msg, true).await.unwrap();
Expand Down
2 changes: 1 addition & 1 deletion consensus/src/simplex/mocks/outdated.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ impl<
// Store proposal
self.history.insert(view, finalize.proposal.clone());

// Finalize provided digest
// Finalize old digest
let view = view.saturating_sub(self.view_delta);
let public_key_index = self
.supervisor
Expand Down
Loading