Use rx-observable-fwd to reduce build time

Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
hyperledger · Sep 27, 2019 · 61a4820 · 61a4820
1 parent 37890db
commit 61a4820
Show file tree

Hide file tree

Showing 39 changed files with 56 additions and 25 deletions.
diff --git a/irohad/ametsuchi/impl/storage_impl.hpp b/irohad/ametsuchi/impl/storage_impl.hpp
@@ -13,6 +13,7 @@
 
 #include <soci/soci.h>
 #include <boost/optional.hpp>
+#include <rxcpp/rx-lite.hpp>
 #include "ametsuchi/block_storage_factory.hpp"
 #include "ametsuchi/impl/pool_wrapper.hpp"
 #include "ametsuchi/impl/postgres_options.hpp"

diff --git a/irohad/ametsuchi/mutable_storage.hpp b/irohad/ametsuchi/mutable_storage.hpp
@@ -8,7 +8,7 @@
 
 #include <functional>
 
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 #include "ametsuchi/ledger_state.hpp"
 #include "interfaces/common_objects/types.hpp"
 

diff --git a/irohad/ametsuchi/storage.hpp b/irohad/ametsuchi/storage.hpp
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 #include "ametsuchi/block_query_factory.hpp"
 #include "ametsuchi/mutable_factory.hpp"
 #include "ametsuchi/peer_query_factory.hpp"

diff --git a/irohad/consensus/yac/impl/yac_gate_impl.hpp b/irohad/consensus/yac/impl/yac_gate_impl.hpp
@@ -10,6 +10,7 @@
 
 #include <memory>
 
+#include <rxcpp/rx-lite.hpp>
 #include "consensus/consensus_block_cache.hpp"
 #include "consensus/yac/yac_hash_provider.hpp"
 #include "logger/logger_fwd.hpp"

diff --git a/irohad/consensus/yac/yac_gate.hpp b/irohad/consensus/yac/yac_gate.hpp
@@ -6,7 +6,7 @@
 #ifndef IROHA_YAC_GATE_HPP
 #define IROHA_YAC_GATE_HPP
 
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 #include "consensus/yac/cluster_order.hpp"
 #include "consensus/yac/storage/storage_result.hpp"
 #include "network/consensus_gate.hpp"

diff --git a/irohad/main/impl/on_demand_ordering_init.hpp b/irohad/main/impl/on_demand_ordering_init.hpp
@@ -8,6 +8,7 @@
 
 #include <random>
 
+#include <rxcpp/rx-lite.hpp>
 #include "ametsuchi/storage.hpp"
 #include "ametsuchi/tx_presence_cache.hpp"
 #include "interfaces/iroha_internal/unsafe_proposal_factory.hpp"

diff --git a/irohad/model/commit.hpp b/irohad/model/commit.hpp
@@ -6,7 +6,7 @@
 #ifndef IROHA_COMMIT_HPP
 #define IROHA_COMMIT_HPP
 
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 
 namespace iroha {
   using OldCommit = rxcpp::observable<model::Block>;

diff --git a/irohad/multi_sig_transactions/impl/mst_processor.cpp b/irohad/multi_sig_transactions/impl/mst_processor.cpp
@@ -5,6 +5,8 @@
 
 #include "multi_sig_transactions/mst_processor.hpp"
 
+#include <rxcpp/rx-lite.hpp>
+
 namespace iroha {
 
   MstProcessor::MstProcessor(logger::LoggerPtr log) : log_(std::move(log)) {}

diff --git a/irohad/multi_sig_transactions/impl/mst_propagation_strategy_stub.cpp b/irohad/multi_sig_transactions/impl/mst_propagation_strategy_stub.cpp
@@ -5,6 +5,8 @@
 
 #include "multi_sig_transactions/mst_propagation_strategy_stub.hpp"
 
+#include <rxcpp/rx-lite.hpp>
+
 namespace iroha {
   rxcpp::observable<PropagationStrategy::PropagationData>
   PropagationStrategyStub::emitter() {

diff --git a/irohad/multi_sig_transactions/mst_processor.hpp b/irohad/multi_sig_transactions/mst_processor.hpp
@@ -8,7 +8,7 @@
 
 #include <memory>
 #include <mutex>
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 #include "logger/logger_fwd.hpp"
 #include "multi_sig_transactions/mst_types.hpp"
 #include "multi_sig_transactions/state/mst_state.hpp"

diff --git a/irohad/multi_sig_transactions/mst_processor_impl.hpp b/irohad/multi_sig_transactions/mst_processor_impl.hpp
@@ -6,14 +6,17 @@
 #ifndef IROHA_MST_PROCESSOR_IMPL_HPP
 #define IROHA_MST_PROCESSOR_IMPL_HPP
 
+#include "multi_sig_transactions/mst_processor.hpp"
+#include "network/mst_transport.hpp"
+
 #include <memory>
+
+#include <rxcpp/rx-lite.hpp>
 #include "cryptography/public_key.hpp"
 #include "logger/logger_fwd.hpp"
-#include "multi_sig_transactions/mst_processor.hpp"
 #include "multi_sig_transactions/mst_propagation_strategy.hpp"
 #include "multi_sig_transactions/mst_time_provider.hpp"
 #include "multi_sig_transactions/storage/mst_storage.hpp"
-#include "network/mst_transport.hpp"
 
 namespace iroha {
 

diff --git a/irohad/multi_sig_transactions/mst_propagation_strategy.hpp b/irohad/multi_sig_transactions/mst_propagation_strategy.hpp
@@ -6,7 +6,7 @@
 #ifndef IROHA_MST_PROPAGATION_STRATEGY_HPP
 #define IROHA_MST_PROPAGATION_STRATEGY_HPP
 
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 #include <vector>
 #include "interfaces/common_objects/peer.hpp"
 

diff --git a/irohad/network/block_loader.hpp b/irohad/network/block_loader.hpp
@@ -7,7 +7,7 @@
 #define IROHA_BLOCK_LOADER_HPP
 
 #include <memory>
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 
 #include "cryptography/public_key.hpp"
 #include "interfaces/common_objects/types.hpp"

diff --git a/irohad/network/consensus_gate.hpp b/irohad/network/consensus_gate.hpp
@@ -6,7 +6,7 @@
 #ifndef IROHA_CONSENSUS_GATE_HPP
 #define IROHA_CONSENSUS_GATE_HPP
 
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 #include "consensus/gate_object.hpp"
 
 namespace shared_model {

diff --git a/irohad/network/impl/block_loader_impl.cpp b/irohad/network/impl/block_loader_impl.cpp
@@ -5,9 +5,10 @@
 
 #include "network/impl/block_loader_impl.hpp"
 
-#include <grpc++/create_channel.h>
 #include <chrono>
 
+#include <grpc++/create_channel.h>
+#include <rxcpp/rx-lite.hpp>
 #include "backend/protobuf/block.hpp"
 #include "builders/protobuf/transport_builder.hpp"
 #include "common/bind.hpp"

diff --git a/irohad/network/impl/peer_communication_service_impl.cpp b/irohad/network/impl/peer_communication_service_impl.cpp
@@ -5,6 +5,7 @@
 
 #include "network/impl/peer_communication_service_impl.hpp"
 
+#include <rxcpp/rx-lite.hpp>
 #include "interfaces/iroha_internal/transaction_batch.hpp"
 #include "logger/logger.hpp"
 #include "network/ordering_gate.hpp"

diff --git a/irohad/network/ordering_gate.hpp b/irohad/network/ordering_gate.hpp
@@ -8,7 +8,7 @@
 
 #include <memory>
 
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 #include "network/ordering_gate_common.hpp"
 #include "network/peer_communication_service.hpp"
 

diff --git a/irohad/network/peer_communication_service.hpp b/irohad/network/peer_communication_service.hpp
@@ -6,7 +6,7 @@
 #ifndef IROHA_PEER_COMMUNICATION_SERVICE_HPP
 #define IROHA_PEER_COMMUNICATION_SERVICE_HPP
 
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 #include "network/ordering_gate_common.hpp"
 #include "simulator/verified_proposal_creator_common.hpp"
 #include "synchronizer/synchronizer_common.hpp"

diff --git a/irohad/pending_txs_storage/pending_txs_storage.hpp b/irohad/pending_txs_storage/pending_txs_storage.hpp
@@ -7,7 +7,6 @@
 #define IROHA_PENDING_TXS_STORAGE_HPP
 
 #include <boost/optional.hpp>
-#include <rxcpp/rx-lite.hpp>
 #include "common/result.hpp"
 #include "interfaces/common_objects/transaction_sequence_common.hpp"
 #include "interfaces/common_objects/types.hpp"

diff --git a/irohad/simulator/block_creator.hpp b/irohad/simulator/block_creator.hpp
@@ -6,7 +6,7 @@
 #ifndef IROHA_BLOCK_CREATOR_HPP
 #define IROHA_BLOCK_CREATOR_HPP
 
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 #include "simulator/block_creator_common.hpp"
 
 namespace iroha {

diff --git a/irohad/simulator/impl/simulator.hpp b/irohad/simulator/impl/simulator.hpp
@@ -10,6 +10,7 @@
 #include "simulator/verified_proposal_creator.hpp"
 
 #include <boost/optional.hpp>
+#include <rxcpp/rx-lite.hpp>
 #include "ametsuchi/temporary_factory.hpp"
 #include "cryptography/crypto_provider/abstract_crypto_model_signer.hpp"
 #include "interfaces/iroha_internal/unsafe_block_factory.hpp"

diff --git a/irohad/simulator/verified_proposal_creator.hpp b/irohad/simulator/verified_proposal_creator.hpp
@@ -6,7 +6,7 @@
 #ifndef IROHA_VERIFIED_PROPOSAL_CREATOR_HPP
 #define IROHA_VERIFIED_PROPOSAL_CREATOR_HPP
 
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 #include "simulator/verified_proposal_creator_common.hpp"
 
 namespace shared_model {

diff --git a/irohad/synchronizer/impl/synchronizer_impl.hpp b/irohad/synchronizer/impl/synchronizer_impl.hpp
@@ -8,6 +8,7 @@
 
 #include "synchronizer/synchronizer.hpp"
 
+#include <rxcpp/rx-lite.hpp>
 #include "ametsuchi/commit_result.hpp"
 #include "ametsuchi/mutable_factory.hpp"
 #include "ametsuchi/peer_query_factory.hpp"

diff --git a/irohad/synchronizer/synchronizer.hpp b/irohad/synchronizer/synchronizer.hpp
@@ -6,7 +6,7 @@
 #ifndef IROHA_SYNCHRONIZER_HPP
 #define IROHA_SYNCHRONIZER_HPP
 
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 
 #include "consensus/gate_object.hpp"
 #include "synchronizer/synchronizer_common.hpp"

diff --git a/irohad/torii/command_service.hpp b/irohad/torii/command_service.hpp
@@ -6,7 +6,7 @@
 #ifndef TORII_COMMAND_SERVICE_HPP
 #define TORII_COMMAND_SERVICE_HPP
 
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 #include "interfaces/common_objects/types.hpp"
 
 namespace shared_model {

diff --git a/irohad/torii/impl/command_service_impl.hpp b/irohad/torii/impl/command_service_impl.hpp
@@ -8,6 +8,7 @@
 
 #include "torii/command_service.hpp"
 
+#include <rxcpp/rx-lite.hpp>
 #include "ametsuchi/storage.hpp"
 #include "ametsuchi/tx_presence_cache.hpp"
 #include "cache/cache.hpp"

diff --git a/irohad/torii/impl/command_service_transport_grpc.hpp b/irohad/torii/impl/command_service_transport_grpc.hpp
@@ -8,6 +8,7 @@
 
 #include "torii/command_service.hpp"
 
+#include <rxcpp/rx-lite.hpp>
 #include "endpoint.grpc.pb.h"
 #include "endpoint.pb.h"
 #include "interfaces/common_objects/transaction_sequence_common.hpp"

diff --git a/irohad/torii/processor/query_processor.hpp b/irohad/torii/processor/query_processor.hpp
@@ -6,7 +6,7 @@
 #ifndef IROHA_QUERY_PROCESSOR_HPP
 #define IROHA_QUERY_PROCESSOR_HPP
 
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 
 #include <memory>
 

diff --git a/irohad/torii/processor/query_processor_impl.hpp b/irohad/torii/processor/query_processor_impl.hpp
@@ -6,10 +6,12 @@
 #ifndef IROHA_QUERY_PROCESSOR_IMPL_HPP
 #define IROHA_QUERY_PROCESSOR_IMPL_HPP
 
+#include "torii/processor/query_processor.hpp"
+
+#include <rxcpp/rx-lite.hpp>
 #include "ametsuchi/storage.hpp"
 #include "interfaces/iroha_internal/query_response_factory.hpp"
 #include "logger/logger_fwd.hpp"
-#include "torii/processor/query_processor.hpp"
 
 namespace iroha {
   namespace torii {

diff --git a/irohad/torii/status_bus.hpp b/irohad/torii/status_bus.hpp
@@ -6,7 +6,7 @@
 #ifndef TORII_STATUS_BUS
 #define TORII_STATUS_BUS
 
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 #include "interfaces/transaction_responses/tx_response.hpp"
 
 namespace iroha {

diff --git a/irohad/validation/chain_validator.hpp b/irohad/validation/chain_validator.hpp
@@ -6,7 +6,9 @@
 #ifndef IROHA_CHAIN_VALIDATOR_HPP
 #define IROHA_CHAIN_VALIDATOR_HPP
 
-#include <rxcpp/rx-lite.hpp>
+#include <memory>
+
+#include <rxcpp/rx-observable-fwd.hpp>
 
 namespace shared_model {
   namespace interface {

diff --git a/irohad/validation/impl/chain_validator_impl.cpp b/irohad/validation/impl/chain_validator_impl.cpp
@@ -5,6 +5,7 @@
 
 #include "validation/impl/chain_validator_impl.hpp"
 
+#include <rxcpp/rx-lite.hpp>
 #include "ametsuchi/ledger_state.hpp"
 #include "ametsuchi/mutable_storage.hpp"
 #include "consensus/yac/supermajority_checker.hpp"

diff --git a/test/framework/integration_framework/fake_peer/behaviour/behaviour.hpp b/test/framework/integration_framework/fake_peer/behaviour/behaviour.hpp
@@ -10,6 +10,7 @@
 #include <memory>
 #include <vector>
 
+#include <rxcpp/rx-lite.hpp>
 #include "framework/integration_framework/fake_peer/fake_peer.hpp"
 #include "framework/integration_framework/fake_peer/types.hpp"
 #include "logger/logger_fwd.hpp"

diff --git a/test/framework/integration_framework/fake_peer/fake_peer.hpp b/test/framework/integration_framework/fake_peer/fake_peer.hpp
@@ -10,7 +10,7 @@
 #include <string>
 
 #include <boost/core/noncopyable.hpp>
-#include <rxcpp/rx-lite.hpp>
+#include <rxcpp/rx-observable-fwd.hpp>
 #include "framework/integration_framework/fake_peer/network/mst_message.hpp"
 #include "framework/integration_framework/fake_peer/proposal_storage.hpp"
 #include "framework/integration_framework/fake_peer/types.hpp"

diff --git a/test/framework/integration_framework/integration_test_framework.hpp b/test/framework/integration_framework/integration_test_framework.hpp
@@ -6,7 +6,11 @@
 #ifndef IROHA_INTEGRATION_FRAMEWORK_HPP
 #define IROHA_INTEGRATION_FRAMEWORK_HPP
 
-#include <rxcpp/rx-lite.hpp>
+#include <chrono>
+#include <condition_variable>
+#include <mutex>
+
+#include <rxcpp/rx-observable-fwd.hpp>
 #include "consensus/gate_object.hpp"
 #include "cryptography/keypair.hpp"
 #include "logger/logger_fwd.hpp"

diff --git a/test/integration/acceptance/query_test.cpp b/test/integration/acceptance/query_test.cpp
@@ -3,10 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include "integration/acceptance/acceptance_fixture.hpp"
+
+#include <thread>
+
 #include <boost/variant.hpp>
 #include "backend/protobuf/query_responses/proto_query_response.hpp"
 #include "framework/integration_framework/integration_test_framework.hpp"
-#include "integration/acceptance/acceptance_fixture.hpp"
 #include "interfaces/query_responses/transactions_response.hpp"
 
 using namespace integration_framework;

diff --git a/test/module/irohad/ametsuchi/mock_mutable_storage.hpp b/test/module/irohad/ametsuchi/mock_mutable_storage.hpp
@@ -9,6 +9,7 @@
 #include "ametsuchi/mutable_storage.hpp"
 
 #include <gmock/gmock.h>
+#include <rxcpp/rx-lite.hpp>
 
 namespace iroha {
   namespace ametsuchi {

diff --git a/test/module/irohad/ametsuchi/mock_storage.hpp b/test/module/irohad/ametsuchi/mock_storage.hpp
@@ -9,6 +9,7 @@
 #include "ametsuchi/storage.hpp"
 
 #include <gmock/gmock.h>
+#include <rxcpp/rx-lite.hpp>
 #include "ametsuchi/block_storage_factory.hpp"
 #include "ametsuchi/mutable_storage.hpp"
 #include "ametsuchi/temporary_wsv.hpp"

diff --git a/test/module/irohad/torii/processor/mock_query_processor.hpp b/test/module/irohad/torii/processor/mock_query_processor.hpp
@@ -9,6 +9,7 @@
 #include "torii/processor/query_processor.hpp"
 
 #include <gmock/gmock.h>
+#include <rxcpp/rx-lite.hpp>
 
 namespace iroha {
   namespace torii {