Skip to content

Commit

Permalink
fix: post rebase merge conflict
Browse files Browse the repository at this point in the history
A couple of PRs were reverted so we can continue to upgrade this crate while it has changes that are
incompatible with the current `safe_network` code.

I incorrectly resolved the merge conflict that resulted from reverting those changes.
  • Loading branch information
jacderida committed Jul 20, 2022
1 parent 37872f6 commit 88c58ed
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions src/consensus.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,7 @@ impl<T: Proposition> Consensus<T> {
})
.collect::<Result<_>>()?;

let proposals_sig_share = Box::new(self.sign(&proposals)?);

let ballot = Ballot::SuperMajority {
votes,
proposals_sig_share,
}
.simplify();
let ballot = Ballot::SuperMajority { votes, proposals }.simplify();

let vote = Vote {
gen,
Expand Down

0 comments on commit 88c58ed

Please sign in to comment.