WIP test circle.yml add docker-compose test

circle.yml

@@ -39,6 +39,12 @@ test:
     - export ID=$(docker run -it -d -p 1204:1204 hyperledger/iroha-docker /run.sh); echo "ID=$ID" >> ~/.bashrc
     # put new tests below
     - curl -X POST http://127.0.0.1:1204/account/register -d '{"publicKey":"WdvM/DPabapmtA7ISbTYPywbHxk8gWu2221LzmcmAgw=","alias":"yonezu","timestamp":1482053586}'
+    # docker-compose TEST (add peer)
+    - docker-compose up
+    - docker-compose scale iroha=2
+    # WIP - docker exec -it iroha_iroha_2 sh -c "/usr/local/iroha/bin/make_sumeragi" > /tmp/me.json
+    # WIP - docker exec -it iroha_iroha_1 sh -c "/usr/local/iroha/bin/issue_transaction add peer ${TARGET_IP} ${TARGET_KEY} 1.0 true"
+    - docker exec -it iroha_iroha_1 sh -c "/usr/local/iroha/bin/issue_transaction add peer 172.18.0.5 X/Sk+plpcQ/+Wb9RQybm+OUS7FP3lbkuQmyHuK+uMvQ 1.0 true"
   post:
     # iroha-main logs
     - docker logs $ID

config/config.json

@@ -10,5 +10,5 @@
   "pool_worker_queue_size": 1024,
   "http_port": 1204,
   "grpc_port": 50051,
-  "active_start": true
+  "active_start": false
 }

core/consensus/sumeragi.cpp

@@ -174,6 +174,7 @@ namespace sumeragi {
 
         void update()
         {
+            logger::debug("sumeragi") << "Context update!";
             auto peers = config::PeerServiceConfig::getInstance().getPeerList();
             for (auto&& p : peers ) {
                 validatingPeers.push_back( std::move(p) );
@@ -226,6 +227,7 @@ namespace sumeragi {
             ConsensusEvent event;
             event.set_status("uncommit");
             event.mutable_transaction()->CopyFrom(transaction);
+            context->update();
             // send processTransaction(event) as a task to processing pool
             // this returns std::future<void> object
             // (std::future).get() method locks processing until result of processTransaction will be available

core/infra/config/peer_service_with_json.cpp

@@ -155,7 +155,7 @@ void PeerServiceConfig::initialziePeerList_from_json(){
   for (const auto& peer : getGroup()) {
     peerList.emplace_back( peer["ip"].get<std::string>(),
                            peer["publicKey"].get<std::string>(),
-                           1.0);
+                           getMaxTrustScore() );
   }
 }
 
@@ -185,6 +185,8 @@ std::vector<std::unique_ptr<peer::Node>> PeerServiceConfig::getPeerList() {
     nodes.push_back( std::make_unique<peer::Node>( node.getIP(), node.getPublicKey(), node.getTrustScore() ) );
   sort( nodes.begin(), nodes.end(),
         []( const std::unique_ptr<peer::Node> &a, const std::unique_ptr<peer::Node> &b ) { return a->getTrustScore() > b->getTrustScore(); } );
+  for( auto &&node : nodes )
+      logger::debug("getPeerList") << node->getIP() + " " <<node->getPublicKey();
   return nodes;
 }
 std::vector<std::string> PeerServiceConfig::getIpList() {