wip fix cmake and dependence

joeynor · Jun 19, 2017 · 1727cc4 · 1727cc4
1 parent 7edef1b
commit 1727cc4
Show file tree

Hide file tree

Showing 15 changed files with 112 additions and 476 deletions.
diff --git a/irohad/peer_service/CMakeLists.txt b/irohad/peer_service/CMakeLists.txt
@@ -13,7 +13,6 @@
 #)
 
 ADD_LIBRARY(peer_service STATIC
-    peer_service.cpp
     monitor.cpp
     change_state.cpp
     self_state.cpp
@@ -22,10 +21,9 @@ ADD_LIBRARY(peer_service STATIC
 
 target_link_libraries(peer_service
     timer
-    exception
+    time64
     logger
     crypto
     schema
     ametsuchi
-    datetime
 )
diff --git a/irohad/peer_service/change_state.cpp b/irohad/peer_service/change_state.cpp
@@ -15,6 +15,7 @@ limitations under the License.
 */
 #include <peer_service/change_state.hpp>
 #include <peer_service/monitor.hpp>
+#include <peer_service/self_state.hpp>
 
 #include <unordered_set>
 
@@ -109,11 +110,11 @@ namespace peer_service {
             detail::eraseActive(publicKey);
         }
         node->state_ = state;
+        return true;
       }
     };
 
     namespace detail {
-
       void insertActive(const std::shared_ptr<Node> node) {
         for (auto it = active_peer_list_.begin(); it != active_peer_list_.end();
              it++) {
@@ -139,5 +140,16 @@ namespace peer_service {
         insertActive(node);
       }
     }
+
+    void initialize() {
+      if (!peer_list_.empty()) return;
+      // TODO Read config.json
+
+      // At First myself only
+      peer_list_.emplace_back(std::make_shared<Node>(
+          self_state::getIp(), self_state::getPublicKey(),
+          self_state::getName(), self_state::getTrust(),
+          self_state::getActiveTime(), self_state::getState()));
+    }
   }
 };
diff --git a/irohad/peer_service/change_state.hpp b/irohad/peer_service/change_state.hpp
@@ -17,7 +17,6 @@ limitations under the License.
 #define __IROHA_PEER_SERVICE_CHANGE_STATE_HPP__
 
 #include <peer_service/peer_service.hpp>
-#include <string>
 
 namespace peer_service {
   namespace change_state {
@@ -60,6 +59,8 @@ namespace peer_service {
       void eraseActive(const std::string &publicKey);
       void changeActive(const std::shared_ptr<Node> node);
     }
+
+    void initialize();
   };
 };
 

diff --git a/irohad/peer_service/monitor.cpp b/irohad/peer_service/monitor.cpp
@@ -15,9 +15,6 @@ limitations under the License.
 */
 
 #include <peer_service/monitor.hpp>
-#include <peer_service/self_state.hpp>
-
-#include <algorithm>
 
 namespace peer_service{
   namespace monitor{
@@ -30,23 +27,6 @@ namespace peer_service{
     }
 
 
-    void initialize(){
-      if( !peer_list_.empty() ) return;
-      // TODO Read config.json
-
-      // At First myself only
-      peer_list_.emplace_back(
-          std::make_shared<Node>(
-              self_state::getIp(),
-              self_state::getPublicKey(),
-              self_state::getName(),
-              self_state::getTrust(),
-              self_state::getActiveTime(),
-              self_state::getState()
-          )
-      );
-    }
-
     size_t getMaxFaulty(){
       return std::max(0, (getActivePeerSize() - 1) / 3);
     }
@@ -60,6 +40,7 @@ namespace peer_service{
       } catch( const std::out_of_range& oor ){
         // TODO Out ot Range Exception
       }
+      return nullptr;
     }
     std::vector<std::string> getAllIpList(){
       std::vector<std::string> ret;
@@ -77,6 +58,7 @@ namespace peer_service{
       } catch( const std::out_of_range& oor ){
         // TODO Out ot Range Exception
       }
+      return nullptr;
     }
     std::vector<std::string> getActiveIpList(){
       std::vector<std::string> ret;
@@ -98,12 +80,10 @@ namespace peer_service{
     }
 
     Nodes::iterator findPeerIP(const std::string &ip){
-      initialize();
       return std::find_if(peer_list_.begin(), peer_list_.end(),
                           [&ip](const auto &p) { return p->ip_ == ip; });
     }
     Nodes::iterator findPeerPublicKey(const std::string &publicKey){
-      initialize();
       return std::find_if(
           peer_list_.begin(), peer_list_.end(),
           [&publicKey](const auto &p) { return p->public_key_ == publicKey; });

diff --git a/irohad/peer_service/monitor.hpp b/irohad/peer_service/monitor.hpp
@@ -24,8 +24,6 @@ namespace peer_service {
     std::shared_ptr<Node> getCurrentLeader();
     std::string getCurrentLeaderIp();
 
-    void initialize();
-
     size_t getMaxFaulty();
 
     Nodes getAllPeerList();