Merge branch 'feature/iroha-main' into develop

romo · Aug 4, 2017 · 25b6074 · 25b6074
2 parents 0769acb + 93f043d
commit 25b6074
Show file tree

Hide file tree

Showing 78 changed files with 1,318 additions and 683 deletions.
diff --git a/iroha-cli/main.cpp b/iroha-cli/main.cpp
@@ -31,10 +31,10 @@
 // https://hackmd.io/GwRmwQ2BmCFoCsAGARtOAWBIBMcAcS0GcAZjhNNPvpAKZIDGQA==
 
 DEFINE_string(config, "", "Trusted peer's ip addresses");
-DEFINE_validator(config, &iroha_cli::validate_config);
+//DEFINE_validator(config, &iroha_cli::validate_config);
 
 DEFINE_string(genesis_block, "", "Genesis block for sending network");
-DEFINE_validator(genesis_block, &iroha_cli::validate_genesis_block);
+//DEFINE_validator(genesis_block, &iroha_cli::validate_genesis_block);
 
 DEFINE_bool(new_account, false, "Choose if account does not exist");
 DEFINE_string(name, "", "Name of the account");
@@ -74,7 +74,10 @@ int main(int argc, char* argv[]) {
     std::cout << "Send transaction to " << FLAGS_address << ":"
               << FLAGS_torii_port << std::endl;
     iroha_cli::CliClient client(FLAGS_address, FLAGS_torii_port);
-    auto status = client.sendTx(FLAGS_json_transaction);
+    std::ifstream file(FLAGS_json_transaction);
+    std::string str((std::istreambuf_iterator<char>(file)),
+                    std::istreambuf_iterator<char>());
+    auto status = client.sendTx(str);
     switch (status) {
       case iroha_cli::CliClient::OK:
         std::cout << "Transaction successfully sent" << std::endl;

diff --git a/irohad/common/context.h b/irohad/common/context.h
diff --git a/irohad/consensus/yac/impl/network_impl.cpp b/irohad/consensus/yac/impl/network_impl.cpp
@@ -43,7 +43,8 @@ namespace iroha {
 
       void NetworkImpl::send_commit(model::Peer to, CommitMessage commit) {
         std::cout << output("send_commit " + to.address + " " +
-                            commit.votes.at(0).hash.block_hash)
+                            bytestringToHexstring(
+                                commit.votes.at(0).hash.block_hash))
                   << std::endl;
 
         proto::Commit request;
@@ -71,7 +72,8 @@ namespace iroha {
 
       void NetworkImpl::send_reject(model::Peer to, RejectMessage reject) {
         std::cout << output("send_reject " + to.address + " " +
-                            reject.votes.at(0).hash.block_hash)
+                            bytestringToHexstring(
+                                reject.votes.at(0).hash.block_hash))
                   << std::endl;
 
         proto::Reject request;
@@ -99,7 +101,7 @@ namespace iroha {
 
       void NetworkImpl::send_vote(model::Peer to, VoteMessage vote) {
         std::cout << output("send_vote " + to.address + " " +
-                            vote.hash.block_hash)
+                            bytestringToHexstring(vote.hash.block_hash))
                   << std::endl;
 
         proto::Vote request;
@@ -144,7 +146,7 @@ namespace iroha {
                   vote.signature.pubkey.begin());
 
         std::cout << input("SendVote " + peer.address + " " +
-                           vote.hash.block_hash)
+                           bytestringToHexstring(vote.hash.block_hash))
                   << std::endl;
 
         handler_.lock()->on_vote(peer, vote);
@@ -177,7 +179,8 @@ namespace iroha {
         }
 
         std::cout << input("SendCommit " + peer.address + " " +
-                           commit.votes.at(0).hash.block_hash)
+                           bytestringToHexstring(
+                               commit.votes.at(0).hash.block_hash))
                   << std::endl;
 
         handler_.lock()->on_commit(peer, commit);
@@ -210,7 +213,8 @@ namespace iroha {
         }
 
         std::cout << input("SendReject " + peer.address + " " +
-                           reject.votes.at(0).hash.block_hash)
+                           bytestringToHexstring(
+                               reject.votes.at(0).hash.block_hash))
                   << std::endl;
 
         handler_.lock()->on_reject(peer, reject);

diff --git a/irohad/consensus/yac/impl/peer_orderer_impl.cpp b/irohad/consensus/yac/impl/peer_orderer_impl.cpp
@@ -22,10 +22,8 @@ namespace iroha {
     namespace yac {
 
       PeerOrdererImpl::PeerOrdererImpl(
-          std::shared_ptr<ametsuchi::WsvQuery> query,
-          std::shared_ptr<YacHashProvider> hash_provider)
-          : query_(std::move(query)),
-            hash_provider_(std::move(hash_provider)) {}
+          std::shared_ptr<ametsuchi::WsvQuery> query)
+          : query_(std::move(query)) {}
 
       nonstd::optional<ClusterOrdering> PeerOrdererImpl::getInitialOrdering() {
         auto peers = query_->getPeers();

diff --git a/irohad/consensus/yac/impl/peer_orderer_impl.hpp b/irohad/consensus/yac/impl/peer_orderer_impl.hpp
@@ -27,8 +27,7 @@ namespace iroha {
 
       class PeerOrdererImpl : public YacPeerOrderer {
        public:
-        explicit PeerOrdererImpl(std::shared_ptr<ametsuchi::WsvQuery> query,
-                        std::shared_ptr<YacHashProvider> hash_provider);
+        explicit PeerOrdererImpl(std::shared_ptr<ametsuchi::WsvQuery> query);
 
         nonstd::optional<ClusterOrdering> getInitialOrdering() override;
 

diff --git a/irohad/consensus/yac/impl/yac_gate_impl.cpp b/irohad/consensus/yac/impl/yac_gate_impl.cpp
@@ -22,8 +22,8 @@ namespace iroha {
     namespace yac {
 
       YacGateImpl::YacGateImpl(
-          std::unique_ptr<HashGate> hash_gate,
-          std::unique_ptr<YacPeerOrderer> orderer,
+          std::shared_ptr<HashGate> hash_gate,
+          std::shared_ptr<YacPeerOrderer> orderer,
           std::shared_ptr<YacHashProvider> hash_provider,
           std::shared_ptr<simulator::BlockCreator> block_creator)
           : hash_gate_(std::move(hash_gate)),
@@ -49,6 +49,10 @@ namespace iroha {
       rxcpp::observable<model::Block> YacGateImpl::on_commit() {
         return hash_gate_->on_commit().map([this](auto commit_message) {
           if (commit_message.votes.at(0).hash == current_block_.first) {
+            current_block_.second.sigs.clear();
+            for (auto &&vote : commit_message.votes) {
+              current_block_.second.sigs.push_back(vote.signature);
+            }
             return current_block_.second;
           }
 

diff --git a/irohad/consensus/yac/impl/yac_gate_impl.hpp b/irohad/consensus/yac/impl/yac_gate_impl.hpp
@@ -28,16 +28,16 @@ namespace iroha {
 
       class YacGateImpl : public YacGate {
        public:
-        YacGateImpl(std::unique_ptr<HashGate> hash_gate,
-                    std::unique_ptr<YacPeerOrderer> orderer,
+        YacGateImpl(std::shared_ptr<HashGate> hash_gate,
+                    std::shared_ptr<YacPeerOrderer> orderer,
                     std::shared_ptr<YacHashProvider> hash_provider,
                     std::shared_ptr<simulator::BlockCreator> block_creator);
         void vote(model::Block block) override;
         rxcpp::observable<model::Block> on_commit() override;
 
        private:
-        std::unique_ptr<HashGate> hash_gate_;
-        std::unique_ptr<YacPeerOrderer> orderer_;
+        std::shared_ptr<HashGate> hash_gate_;
+        std::shared_ptr<YacPeerOrderer> orderer_;
         std::shared_ptr<YacHashProvider> hash_provider_;
         std::shared_ptr<simulator::BlockCreator> block_creator_;
 

diff --git a/irohad/main/CMakeLists.txt b/irohad/main/CMakeLists.txt
@@ -12,48 +12,59 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+
 add_library(server_runner server_runner.cpp)
 target_link_libraries(server_runner
-  torii_service
-  logger
-  endpoint
-  schema
-)
+    torii_service
+    logger
+    endpoint
+    schema
+    )
 
 add_library(genesis_block_server
-  genesis_block_server/genesis_block_server.cpp
-  genesis_block_server/genesis_block_processor.cpp
-  impl/raw_block_insertion.cpp
-)
+    genesis_block_server/genesis_block_server.cpp
+    genesis_block_server/genesis_block_processor.cpp
+    impl/raw_block_insertion.cpp
+    )
 target_link_libraries(genesis_block_server
-  ametsuchi
-  model
-  timer
-  endpoint
-  optional
-  logger
-)
+    ametsuchi
+    model
+    timer
+    endpoint
+    optional
+    logger
+    )
 
-add_library(application application.cpp)
+add_library(application
+    application.cpp
+    impl/ordering_init.cpp
+    impl/consensus_init.cpp
+    )
 target_link_libraries(application
-  server_runner
-  model
-  ametsuchi
-  networking
-  ordering_service
-  chain_validator
-  hash
-  stateless_validator
-  processors
-  crypto
-)
+    gtest
+    gmock
+    yac
+    server_runner
+    model
+    ametsuchi
+    networking
+    ordering_service
+    chain_validator
+    hash
+    stateless_validator
+    stateful_validator
+    processors
+    crypto
+    simulator
+    )
 
 add_executable(irohad irohad.cpp)
 target_link_libraries(irohad
-  application
-  genesis_block_server
-  ametsuchi
-  gflags
-  rapidjson
-  config
-)
+    application
+    genesis_block_server
+    ametsuchi
+    gflags
+    rapidjson
+    config
+    )