optimize import with clion

Signed-off-by: Alexey Chernyshov <[email protected]>
SabiAmeno · Jan 25, 2018 · 9376e19 · 9376e19
1 parent bbcb240
commit 9376e19
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 38 deletions.
diff --git a/housekeeping/upsource-webhook.py b/housekeeping/upsource-webhook.py
@@ -1,11 +1,11 @@
 #!/usr/bin/python3
 
+import argparse
 import json
-import requests
 import os
-import argparse
-
+import requests
 from flask import Flask, request
+
 app = Flask(__name__)
 
 

diff --git a/iroha-cli/client.cpp b/iroha-cli/client.cpp
@@ -17,8 +17,6 @@
 
 #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 "model/converters/pb_query_factory.hpp"
 #include "model/converters/pb_transaction_factory.hpp"

diff --git a/iroha-cli/main.cpp b/iroha-cli/main.cpp
@@ -26,14 +26,10 @@
 #include "crypto/keys_manager_impl.hpp"
 #include "grpc_response_handler.hpp"
 #include "interactive/interactive_cli.hpp"
-#include "logger/logger.hpp"
 #include "model/converters/json_block_factory.hpp"
-#include "model/converters/json_common.hpp"
 #include "model/converters/json_query_factory.hpp"
 #include "model/generators/block_generator.hpp"
-#include "model/generators/signature_generator.hpp"
 #include "model/model_crypto_provider_impl.hpp"
-#include "responses.pb.h"
 #include "validators.hpp"
 
 DEFINE_string(config, "", "Trusted peer's ip addresses");

diff --git a/irohad/main/irohad.cpp b/irohad/main/irohad.cpp
@@ -24,8 +24,6 @@
 #include "main/iroha_conf_loader.hpp"
 #include "main/raw_block_loader.hpp"
 
-#include "logger/logger.hpp"
-
 /**
  * Gflag validator.
  * Validator for the configuration file path input argument.

diff --git a/irohad/torii/command_client.cpp b/irohad/torii/command_client.cpp
@@ -11,12 +11,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include <block.pb.h>
+#include <thread>
+
 #include <grpc++/grpc++.h>
 #include <network/grpc_call.hpp>
-#include <thread>
-#include <torii/command_client.hpp>
-#include <torii/torii_service_handler.hpp>
+
+#include "block.pb.h"
+#include "torii/command_client.hpp"
+#include "torii/torii_service_handler.hpp"
 
 namespace torii {
 

diff --git a/irohad/torii/processor/query_processor.hpp b/irohad/torii/processor/query_processor.hpp
@@ -18,11 +18,12 @@
 #ifndef IROHA_QUERY_PROCESSOR_HPP
 #define IROHA_QUERY_PROCESSOR_HPP
 
-#include <model/client.hpp>
-#include <model/query.hpp>
-#include <model/query_response.hpp>
 #include <rxcpp/rx.hpp>
 
+#include "model/client.hpp"
+#include "model/query.hpp"
+#include "model/query_response.hpp"
+
 namespace iroha {
   namespace torii {
 

diff --git a/irohad/torii/torii_service_handler.cpp b/irohad/torii/torii_service_handler.cpp
@@ -14,15 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
  */
 
-#include <endpoint.grpc.pb.h>
-#include <google/protobuf/empty.pb.h>
-#include <grpc/support/time.h>
-#include <unistd.h>
-#include <network/grpc_async_service.hpp>
-#include <network/grpc_call.hpp>
-#include <torii/command_service.hpp>
-#include <torii/query_service.hpp>
-#include <torii/torii_service_handler.hpp>
+#include "endpoint.grpc.pb.h"
+#include "network/grpc_async_service.hpp"
+#include "network/grpc_call.hpp"
+#include "torii/command_service.hpp"
+#include "torii/query_service.hpp"
+#include "torii/torii_service_handler.hpp"
 
 namespace prot = iroha::protocol;
 
@@ -159,10 +156,12 @@ namespace torii {
         &ToriiServiceHandler::QueryFindHandler,
         queryAsyncService_);
   }
+
   void ToriiServiceHandler::assignCommandHandler(
       std::unique_ptr<torii::CommandService> command_service) {
     command_service_ = std::move(command_service);
   }
+
   void ToriiServiceHandler::assignQueryHandler(
       std::unique_ptr<torii::QueryService> query_service) {
     query_service_ = std::move(query_service);

diff --git a/libs/crypto/keys_manager_impl.cpp b/libs/crypto/keys_manager_impl.cpp
@@ -16,12 +16,9 @@
  */
 
 #include "keys_manager_impl.hpp"
-#include "cryptography/ed25519_sha3_impl/internal/ed25519_impl.hpp"
 #include "cryptography/ed25519_sha3_impl/internal/sha3_hash.hpp"
-#include "logger/logger.hpp"
 
 #include <fstream>
-#include <utility>
 
 using iroha::operator|;
 

diff --git a/libs/generator/generator.cpp b/libs/generator/generator.cpp
@@ -17,8 +17,6 @@
 
 #include "generator/generator.hpp"
 
-#include <cstdlib>
-
 namespace generator {
 
   int64_t random_number(int64_t min, int64_t max) {

diff --git a/libs/validator/domain_name_validator.cpp b/libs/validator/domain_name_validator.cpp
@@ -18,11 +18,6 @@
 #include "validator/domain_name_validator.hpp"
 
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/qi_char_class.hpp>
-#include <boost/spirit/include/qi_lexeme.hpp>
-#include <boost/spirit/include/qi_optional.hpp>
-#include <boost/spirit/include/qi_parse.hpp>
-#include <boost/spirit/include/qi_plus.hpp>
 
 namespace validator {
   bool isValidDomainName(const std::string &str) {

diff --git a/test/framework/test_block_generator.cpp b/test/framework/test_block_generator.cpp
@@ -23,7 +23,6 @@
 #include "model/commands/create_account.hpp"
 #include "model/commands/create_asset.hpp"
 #include "model/commands/create_domain.hpp"
-#include "model/commands/create_role.hpp"
 #include "model/permissions.hpp"
 
 using namespace iroha;