Merge branch 'feature/consensus-locks' into develop

neo4reo · Aug 30, 2017 · 5533db8 · 5533db8
2 parents 8fe822f + c3185cb
commit 5533db8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/irohad/consensus/yac/impl/yac.cpp b/irohad/consensus/yac/impl/yac.cpp
@@ -66,18 +66,21 @@ namespace iroha {
       // ------|Network notifications|------
 
       void Yac::on_vote(model::Peer from, VoteMessage vote) {
+        std::lock_guard<std::mutex> guard(mutex_);
         if (crypto_->verify(vote)) {
           this->applyVote(from, vote);
         }
       }
 
       void Yac::on_commit(model::Peer from, CommitMessage commit) {
+        std::lock_guard<std::mutex> guard(mutex_);
         if (crypto_->verify(commit)) {
           this->applyCommit(from, commit);
         }
       }
 
       void Yac::on_reject(model::Peer from, RejectMessage reject) {
+        std::lock_guard<std::mutex> guard(mutex_);
         if (crypto_->verify(reject)) {
           this->applyReject(from, reject);
         }

diff --git a/irohad/consensus/yac/yac.hpp b/irohad/consensus/yac/yac.hpp
@@ -23,6 +23,7 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
+#include <mutex>
 #include <nonstd/optional.hpp>
 
 #include "consensus/yac/yac_gate.hpp"
@@ -101,6 +102,7 @@ namespace iroha {
         std::shared_ptr<YacCryptoProvider> crypto_;
         std::shared_ptr<Timer> timer_;
         rxcpp::subjects::subject<CommitMessage> notifier_;
+        std::mutex mutex_;
 
         // ------|One round|------
         ClusterOrdering cluster_order_;