diff options
| author | Determinant <ted.sybil@gmail.com> | 2019-07-05 18:25:43 -0400 |
|---|---|---|
| committer | Determinant <ted.sybil@gmail.com> | 2019-07-05 18:25:43 -0400 |
| commit | 346f688916d87ff856a81e9cf3f3e69245101475 (patch) | |
| tree | e0a0ae7651ee42b487583bb33141863372bacb04 /src/consensus.cpp | |
| parent | 200cbbeb4471443ddf964bfd0a37849ece0efdc4 (diff) | |
WIP: pacemaker clean up
Diffstat (limited to 'src/consensus.cpp')
| -rw-r--r-- | src/consensus.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/consensus.cpp b/src/consensus.cpp index 5dadbe0..70c1876 100644 --- a/src/consensus.cpp +++ b/src/consensus.cpp @@ -142,6 +142,7 @@ void HotStuffCore::update(const block_t &nblk) { { const block_t &blk = *it; blk->decision = 1; + do_consensus(blk); LOG_PROTO("commit %s", std::string(*blk).c_str()); for (size_t i = 0; i < blk->cmds.size(); i++) do_decide(Finality(id, 1, i, blk->height, @@ -150,7 +151,7 @@ void HotStuffCore::update(const block_t &nblk) { b_exec = blk; } -void HotStuffCore::on_propose(const std::vector<uint256_t> &cmds, +block_t HotStuffCore::on_propose(const std::vector<uint256_t> &cmds, const std::vector<block_t> &parents, bytearray_t &&extra) { if (parents.empty()) @@ -189,6 +190,7 @@ void HotStuffCore::on_propose(const std::vector<uint256_t> &cmds, on_propose_(prop); /* boradcast to other replicas */ do_broadcast_proposal(prop); + return bnew; } void HotStuffCore::on_receive_proposal(const Proposal &prop) { @@ -249,8 +251,8 @@ void HotStuffCore::on_receive_vote(const Vote &vote) { if (qsize + 1 == config.nmajority) { qc->compute(); - on_qc_finish(blk); update_hqc(blk, qc); + on_qc_finish(blk); } } /*** end HotStuff protocol logic ***/ |