Refactor query client:

- Move query serializer to model/converters/json_query_factory
- Fix styling issues
- Add  model_converters to cmake

iroha-cli/CMakeLists.txt

@@ -32,7 +32,7 @@ add_library(client
     client.cpp
     )
 target_link_libraries(client
-    model
+    model_converters
     crypto
     optional
     rapidjson

iroha-cli/client.cpp

@@ -16,10 +16,10 @@
  */
 
 #include "client.hpp"
+#include <model/converters/json_query_factory.hpp>
 #include <utility>
 #include "model/converters/json_common.hpp"
 #include "model/converters/json_transaction_factory.hpp"
-#include <ametsuchi/query_serializer.hpp>
 #include "model/converters/pb_transaction_factory.hpp"
 
 namespace iroha_cli {
@@ -52,7 +52,7 @@ namespace iroha_cli {
   }
 
   iroha::protocol::QueryResponse CliClient::sendQuery(std::string json_query) {
-    iroha::ametsuchi::QuerySerializer serializer;
+    iroha::model::converters::JsonQueryFactory serializer;
 
     auto query_opt = serializer.deserialize(std::move(json_query));
 
@@ -65,7 +65,7 @@ namespace iroha_cli {
       return query_response;
     }
 
-    query_client_.Find(*query_opt, query_response);
+    query_client_.Find(query_opt.value(), query_response);
 
     return query_response;
   }

iroha-cli/main.cpp

@@ -49,7 +49,17 @@ DEFINE_validator(torii_port, &iroha_cli::validate_port);
 DEFINE_string(json_transaction, "", "Transaction in json format");
 DEFINE_string(json_query, "", "Query in json format");
 
-void create_account(std::string name);
+void print_response(iroha::protocol::QueryResponse response){
+  // TODO: implement beautiful output
+  if (response.has_error_response()){
+    std::cout << "Iroha returned error " << response.error_response().reason()<< std::endl;
+  }
+  if (response.has_account_response()){
+    auto account = response.account_response().account();
+    std::cout << "[Account:] " << std::endl;
+    std::cout << "---- AccountID: "<<  account.account_id() << std::endl;
+  }
+}
 
 int main(int argc, char* argv[]) {
   gflags::ParseCommandLineFlags(&argc, &argv, true);
@@ -92,23 +102,15 @@ int main(int argc, char* argv[]) {
           std::cout << "Transaction is not valid." << std::endl;
           break;
       }
-      if (not FLAGS_json_query.empty()){
-        std::cout << "Send query to " <<  FLAGS_address << ":"
-                  << FLAGS_torii_port << std::endl;
-        std::ifstream file(FLAGS_json_transaction);
-        std::string str((std::istreambuf_iterator<char>(file)),
-                        std::istreambuf_iterator<char>());
-        auto response = client.sendQuery(str);
-        if (response.has_error_response()) {
-          std::cout << "Iroha returned error " << response.error_response().reason()<< std::endl;
-        }
-        if (response.has_account_response()){
-          auto account = response.account_response().account();
-          std::cout << "[Account:] " << std::endl;
-          std::cout << "---- AccountID: "<<  account.account_id() << std::endl;
-        }
-        // TODO: implement beautiful output
-      }
+    }
+    if (not FLAGS_json_query.empty()){
+      std::cout << "Send query to " <<  FLAGS_address << ":"
+                                    << FLAGS_torii_port << std::endl;
+      std::ifstream file(FLAGS_json_transaction);
+      std::string str((std::istreambuf_iterator<char>(file)),
+                      std::istreambuf_iterator<char>());
+      auto response = client.sendQuery(str);
+      print_response(response);
     }
 
   } else {

irohad/ametsuchi/CMakeLists.txt

@@ -8,8 +8,6 @@ add_library(ametsuchi
     impl/postgres_wsv_query.cpp
     impl/postgres_wsv_command.cpp
     impl/block_serializer.cpp
-    impl/query_serializer.cpp
-
     impl/peer_query_wsv.cpp
     )
 

irohad/model/CMakeLists.txt

@@ -25,3 +25,14 @@ target_link_libraries(model
     rapidjson
     logger
     )
+
+
+add_library(model_converters
+    converters/impl/json_query_factory.cpp
+    )
+
+target_link_libraries(model_converters
+    rapidjson
+    optional
+    schema
+    )