cmplete integrate cmake - peer_service;

romo · Jun 14, 2017 · 1d0afb1 · 1d0afb1
1 parent 5648246
commit 1d0afb1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/core/ordering/CMakeLists.txt b/core/ordering/CMakeLists.txt
@@ -1 +1,5 @@
-add_library(ordering STATIC queue.cpp observer.cpp)
+add_library(ordering STATIC queue.cpp observer.cpp)
+
+target_link_libraries(ordering
+  peer_service
+)
diff --git a/core/ordering/observer.cpp b/core/ordering/observer.cpp
@@ -16,7 +16,7 @@ limitations under the License.
 #include "observer.hpp"
 #include "quque.hpp"
 #include <common/timer.hpp>
-//#include <peer_service/self_state.hpp>
+#include <peer_service/self_state.hpp>
 
 namespace ordering {
     namespace observer {
@@ -25,7 +25,7 @@ namespace ordering {
             while (1) {
                 timer::setAwkTimer(5000, []() {
                     if( queue::isCreateBlock() ) {
-                      if (1/*peer_service::self_state::isLeader()*/) {
+                      if (peer_service::self_state::isLeader()) {
                         auto block = queue::getBlock();
                         //   ToDo send leader node
                       } else {

diff --git a/core/runtime/CMakeLists.txt b/core/runtime/CMakeLists.txt
@@ -2,4 +2,5 @@ ADD_LIBRARY(runtime STATIC runtime.cpp)
 
 target_link_libraries(runtime
     scheme
+    peer_service
 )
diff --git a/core/runtime/operate_peer.hpp b/core/runtime/operate_peer.hpp
@@ -18,7 +18,7 @@ limitations under the License.
 
 #include <block.pb.h>
 #include "base.hpp"
-//#include <peer_service/change_state.hpp>
+#include <peer_service/change_state.hpp>
 
 namespace runtime {
     using Transaction = iroha::protocol::Transaction;
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,5 @@ ADD_LIBRARY(runtime STATIC runtime.cpp) @@
     target_link_libraries(runtime
         scheme
+        peer_service
     )