aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/consensus.cpp4
-rw-r--r--src/hotstuff.cpp5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/consensus.cpp b/src/consensus.cpp
index f752515..d801de8 100644
--- a/src/consensus.cpp
+++ b/src/consensus.cpp
@@ -119,9 +119,9 @@ void HotStuffCore::update(const block_t &nblk) {
const block_t &blk = *it;
blk->decision = 1;
LOG_PROTO("commit %s", std::string(*blk).c_str());
- for (size_t i = 0; i < blks->cmds.size(); i++)
+ for (size_t i = 0; i < blk->cmds.size(); i++)
do_decide(Finality(id, 1, i, blk->height,
- cmd, blk->get_hash()));
+ blk->cmds[i], blk->get_hash()));
}
bexec = p;
}
diff --git a/src/hotstuff.cpp b/src/hotstuff.cpp
index 9b36fa2..aeae2e2 100644
--- a/src/hotstuff.cpp
+++ b/src/hotstuff.cpp
@@ -85,10 +85,11 @@ promise_t HotStuffBase::exec_command(uint256_t cmd_hash) {
});
auto it = decision_waiting.find(cmd_hash);
+ promise_t pm{};
if (it == decision_waiting.end())
{
cmd_pending.push(cmd_hash);
- it = decision_waiting.insert(std::make_pair(cmd_hash, promise_t())).first;
+ it = decision_waiting.insert(std::make_pair(cmd_hash, pm)).first;
}
if (cmd_pending.size() >= blk_size)
@@ -117,7 +118,7 @@ promise_t HotStuffBase::exec_command(uint256_t cmd_hash) {
on_propose(cmds, pmaker->get_parents());
});
}
- return it->second;
+ return pm;
}
void HotStuffBase::on_fetch_blk(const block_t &blk) {