Merge branch 'feature/connection-impl' into jp-new-architecture

joeynor · Jun 13, 2017 · 996d496 · 996d496
2 parents cb303c7 + dcc423c
commit 996d496
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/core/connection/api/command_service.cpp b/core/connection/api/command_service.cpp
@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 #include "command_service.hpp"
+#include <validation/stateless/validator.hpp>
+#include <ordering/quque.hpp>
 
 namespace connection {
     namespace api {
@@ -28,15 +30,14 @@ namespace connection {
             // TODO: Use this to get client's ip and port.
             (void) context;
 
-            Block_Body body;
-            *body.mutable_txs()->Add() = request;
-
-            Block block;
-            *block.mutable_body() = body;
-
-            // TODO: Return tracking log number (hash)
-            *response = ToriiResponse();
-
+            if(validator::stateless::validate(request)){
+                ordering::queue::append(request);
+                // TODO: Return tracking log number (hash)
+                *response = ToriiResponse();
+            }else{
+                // TODO: Return validation failed message
+                *response = ToriiResponse();
+            }
             return grpc::Status::OK;
         }
 

diff --git a/core/ordering/observer.cpp b/core/ordering/observer.cpp
@@ -0,0 +1,4 @@
+//
+// Created by TaiseiIgarashi on 2017/06/14.
+//
+
diff --git a/core/ordering/observer.hpp b/core/ordering/observer.hpp
@@ -0,0 +1,8 @@
+//
+// Created by TaiseiIgarashi on 2017/06/14.
+//
+
+#ifndef IROHA_OBSERVER_HPP
+#define IROHA_OBSERVER_HPP
+
+#endif //IROHA_OBSERVER_HPP
diff --git a/schema/CMakeLists.txt b/schema/CMakeLists.txt
@@ -4,7 +4,7 @@
 #execute_process(COMMAND "protoc -I. --cpp_out=. --proto_path=commands.proto asset.proto")
 #execute_process(COMMAND "protoc -I. --cpp_out=. --proto_path=commands.proto commands.proto")
 #execute_process(COMMAND "protoc -I. --cpp_out=. --proto_path=commands.proto primitive.proto")
-
+#execute_process(COMMAND "protoc --proto_path=. --grpc_out=. --cpp_out=. --plugin=protoc-gen-grpc=/usr/local/bin/grpc_cpp_plugin endpoint.proto")
 ADD_LIBRARY(schema STATIC
     asset.pb.cc
     block.pb.cc