Removes combined model.hpp file

Removes includes with relative paths
grimadas · Jul 12, 2017 · 7a4e028 · 7a4e028
1 parent a8d5402
commit 7a4e028
Show file tree

Hide file tree

Showing 47 changed files with 52 additions and 369 deletions.
diff --git a/irohad/CMakeLists.txt b/irohad/CMakeLists.txt
@@ -21,4 +21,4 @@ add_subdirectory(peer_service)
 add_subdirectory(validation)
 add_subdirectory(torii)
 add_subdirectory(network)
-#add_subdirectory(model)
+add_subdirectory(model)
diff --git a/irohad/ametsuchi/block_query.hpp b/irohad/ametsuchi/block_query.hpp
@@ -18,7 +18,8 @@
 #ifndef IROHA_BLOCK_QUERY_HPP
 #define IROHA_BLOCK_QUERY_HPP
 
-#include <model/model.hpp>
+#include <model/transaction.hpp>
+#include <model/block.hpp>
 #include <rxcpp/rx-observable.hpp>
 
 namespace iroha {
@@ -59,7 +60,7 @@ namespace iroha {
       * @param to - ending id
       * @return observable of Model Block
       */
-      virtual rxcpp::observable<iroha::model::Block> get_blocks_in_range(
+      virtual rxcpp::observable<model::Block> get_blocks_in_range(
           uint32_t from, uint32_t to) = 0;
     };
 

diff --git a/irohad/ametsuchi/index/index_mediator.cpp b/irohad/ametsuchi/index/index_mediator.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "index_mediator.hpp"
+#include <ametsuchi/index/index_mediator.hpp>
 #include <block.pb.h>
 
 namespace iroha {

diff --git a/irohad/ametsuchi/wsv_query.hpp b/irohad/ametsuchi/wsv_query.hpp
@@ -19,7 +19,10 @@
 #define IROHA_WSV_QUERY_HPP
 
 #include <common/types.hpp>
-#include <model/model.hpp>
+#include <model/account.hpp>
+#include <model/asset.hpp>
+#include <model/wallet.hpp>
+#include <model/peer.hpp>
 #include <string>
 #include <vector>
 

diff --git a/irohad/common/config.cpp b/irohad/common/config.cpp
@@ -17,7 +17,7 @@ limitations under the License.
 #ifndef __RANDOM_HPP_
 #define __RANDOM_HPP_
 
-#include "config.hpp"
+#include <common/config.hpp>
 
 #include <random>
 #include <fstream>

diff --git a/irohad/consensus/connection/client.cpp b/irohad/consensus/connection/client.cpp
@@ -13,7 +13,7 @@ limitations under the License.
 
 #include <grpc++/grpc++.h>
 #include <block.pb.h>
-#include "client.hpp"
+#include <consensus/connection/client.hpp>
 
 namespace consensus {
   namespace connection {

diff --git a/irohad/consensus/connection/service.cpp b/irohad/consensus/connection/service.cpp
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include "service.hpp"
+#include <consensus/connection/service.hpp>
 #include <block.pb.h>
 #include <endpoint.pb.h>
 

diff --git a/irohad/consensus/consensus_service_stub.hpp b/irohad/consensus/consensus_service_stub.hpp
@@ -21,7 +21,7 @@
 #include <ametsuchi/storage.hpp>
 #include <consensus/consensus_service.hpp>
 #include <validation/chain/validator.hpp>
-#include <validation/stateful/validator.hpp>
+#include <validation/stateful_validator.hpp>
 
 namespace iroha {
   namespace consensus {

diff --git a/irohad/consensus/sumeragi.cpp b/irohad/consensus/sumeragi.cpp
@@ -13,7 +13,7 @@
  */
 
 #include <crypto/crypto.hpp>
-#include <validation/stateful/validator.hpp>
+#include <validation/stateful_validator.hpp>
 #include <torii/command_service.hpp>
 #include <logger/logger.hpp>
 #include <peer_service/self_state.hpp>
@@ -25,9 +25,9 @@
 #include <common/types.hpp>
 #include <common/byteutils.hpp>
 
-#include "connection/service.hpp"
-#include "connection/client.hpp"
-#include "sumeragi.hpp"
+#include <consensus/connection/service.hpp>
+#include <consensus/connection/client.hpp>
+#include <consensus/sumeragi.hpp>
 
 /**
  * |ーーー|　|ーーー|　|ーーー|　|ーーー|

diff --git a/irohad/main/CMakeLists.txt b/irohad/main/CMakeLists.txt
@@ -30,7 +30,6 @@ target_link_libraries(irohad
     ordering_service
     consensus_service
     chain_validator
-    stateful_validator
     hash
     stateless_validator
     client_processor

diff --git a/irohad/main/application.cpp b/irohad/main/application.cpp
@@ -30,7 +30,7 @@ void Irohad::run(){
   iroha::model::ModelCryptoProviderImpl crypto_provider(keypair.privkey, keypair.pubkey);
 
   iroha::validation::StatelessValidatorImpl stateless_validator(crypto_provider);
-  iroha::validation::StatefulValidatorStub stateful_validator;
+//  iroha::validation::StatefulValidatorStub stateful_validator;
   iroha::validation::ChainValidatorStub chain_validator;
   iroha::ordering::OrderingServiceStub ordering_service;
   iroha::consensus::ConsensusServiceStub consensus_service;

diff --git a/irohad/main/application.hpp b/irohad/main/application.hpp
@@ -27,15 +27,13 @@
 #include <torii/processor/transaction_processor_stub.hpp>
 #include <torii/torii_stub.hpp>
 #include <validation/chain/validator_stub.hpp>
-#include <validation/stateful/stub_validator.hpp>
 #include <validation/stateless/validator_impl.hpp>
 
-#include <model/model.hpp>
 #include <model/model_crypto_provider_impl.hpp>
 #include <crypto/crypto.hpp>
 #include <ametsuchi/impl/storage_impl.hpp>
 
-#include "server_runner.hpp"
+#include <main/server_runner.hpp>
 
 
 class Irohad{

diff --git a/irohad/main/server_runner.cpp b/irohad/main/server_runner.cpp
@@ -19,7 +19,7 @@ limitations under the License.
 #include <grpc++/server_context.h>
 #include <logger/logger.hpp>
 
-#include "server_runner.hpp"
+#include <main/server_runner.hpp>
 
 logger::Logger console("ServerRunner");
 

diff --git a/irohad/model/account.hpp b/irohad/model/account.hpp
@@ -17,7 +17,6 @@ limitations under the License.
 #define IROHA_ACCOUNT_HPP
 
 #include <common/types.hpp>
-#include <model/model.hpp>
 #include <string>
 
 namespace iroha {

diff --git a/irohad/model/command.hpp b/irohad/model/command.hpp
@@ -17,6 +17,7 @@
 
 #ifndef IROHA_COMMAND_HPP
 #define IROHA_COMMAND_HPP
+
 #include <ametsuchi/wsv_command.hpp>
 #include <ametsuchi/wsv_query.hpp>
 #include <model/account.hpp>

diff --git a/irohad/model/model.hpp b/irohad/model/model.hpp
diff --git a/irohad/model/peer.hpp b/irohad/model/peer.hpp
@@ -17,7 +17,7 @@ limitations under the License.
 #define IROHA_PEER_H
 
 #include <common/types.hpp>
-#include "account.hpp"
+#include <model/account.hpp>
 
 namespace iroha {
   namespace model {

diff --git a/irohad/model/query.hpp b/irohad/model/query.hpp
@@ -18,8 +18,8 @@
 #ifndef IROHA_QUERY_HPP
 #define IROHA_QUERY_HPP
 
-#include <model/model.hpp>
 #include <string>
+#include <model/signature.hpp>
 
 namespace iroha {
   namespace model {

diff --git a/irohad/model/query_response.hpp b/irohad/model/query_response.hpp
@@ -18,8 +18,8 @@
 #ifndef IROHA_QUERY_RESPONSE_HPP
 #define IROHA_QUERY_RESPONSE_HPP
 
-#include "query.hpp"
-#include "client.hpp"
+#include <model/query.hpp>
+#include <model/client.hpp>
 
 namespace iroha {
   namespace model {

diff --git a/irohad/model/transaction_response.hpp b/irohad/model/transaction_response.hpp
@@ -18,8 +18,8 @@
 #ifndef IROHA_TRANSACTION_RESPONSE_HPP
 #define IROHA_TRANSACTION_RESPONSE_HPP
 
-#include "transaction.hpp"
-#include "client.hpp"
+#include <model/transaction.hpp>
+#include <model/client.hpp>
 
 namespace iroha {
   namespace model {

diff --git a/irohad/network/block_loader.hpp b/irohad/network/block_loader.hpp
@@ -18,8 +18,8 @@
 #ifndef IROHA_BLOCK_LOADER_HPP
 #define IROHA_BLOCK_LOADER_HPP
 
-#include "model/model.hpp"
-#include "rxcpp/rx-observable.hpp"
+#include <model/block.hpp>
+#include <rxcpp/rx-observable.hpp>
 
 namespace iroha {
   namespace network {

diff --git a/irohad/network/network_api.h b/irohad/network/network_api.h
@@ -16,8 +16,9 @@ limitations under the License.
 #ifndef IROHA_NETWORK_H
 #define IROHA_NETWORK_H
 
-#include "model/model.hpp"
-#include "rxcpp/rx-observable.hpp"
+#include <model/proposal.hpp>
+#include <model/block.hpp>
+#include <rxcpp/rx-observable.hpp>
 
 namespace iroha {
   namespace network {

diff --git a/irohad/network/peer_communication_stub.hpp b/irohad/network/peer_communication_stub.hpp
@@ -22,7 +22,7 @@
 #include <consensus/consensus_service_stub.hpp>
 #include <ordering/ordering_service.hpp>
 #include <validation/chain/validator.hpp>
-#include <validation/stateful/validator.hpp>
+#include <validation/stateful_validator.hpp>
 #include <model/model_crypto_provider.hpp>
 #include <model/model_hash_provider.hpp>
 #include <ordering/ordering_service_stub.hpp>

diff --git a/irohad/ordering/connection/client.cpp b/irohad/ordering/connection/client.cpp
@@ -17,7 +17,7 @@ limitations under the License.
 #include <endpoint.grpc.pb.h>
 #include <grpc++/grpc++.h>
 
-#include "client.hpp"
+#include <ordering/connection/client.hpp>
 
 namespace connection {
   namespace ordering {

diff --git a/irohad/ordering/connection/service.cpp b/irohad/ordering/connection/service.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include "service.hpp"
+#include <ordering/connection/service.hpp>
 
 namespace ordering {
   namespace connection {

diff --git a/irohad/ordering/observer.cpp b/irohad/ordering/observer.cpp
@@ -13,11 +13,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-#include "observer.hpp"
+#include <ordering/observer.hpp>
 #include <peer_service/monitor.hpp>
 #include <peer_service/self_state.hpp>
 #include <timer/timer.hpp>
-#include "queue.hpp"
+#include <ordering/queue.hpp>
 
 #include <torii/command_service.hpp>
 #include <ordering/connection/client.hpp>

diff --git a/irohad/ordering/queue.cpp b/irohad/ordering/queue.cpp
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-#include "queue.hpp"
+#include <ordering/queue.hpp>
 #include <datetime/time.hpp>
 
 // ToDo This is MVP. so we should discuss how to implements this.

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

diff --git a/irohad/torii/command_service.cpp b/irohad/torii/command_service.cpp
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include "command_service.hpp"
+#include <torii/command_service.hpp>
 #include <grpc++/server_context.h>
 #include <ordering/queue.hpp>
 #include <validation/stateless/validator.hpp>

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

diff --git a/irohad/torii/processor/transaction_processor.hpp b/irohad/torii/processor/transaction_processor.hpp
@@ -18,8 +18,9 @@
 #ifndef IROHA_TRANSACTION_PROCESSOR_HPP
 #define IROHA_TRANSACTION_PROCESSOR_HPP
 
-#include <model/model.hpp>
 #include <rxcpp/rx.hpp>
+#include <model/transaction.hpp>
+#include <model/client.hpp>
 
 namespace iroha {
   namespace torii {

diff --git a/irohad/torii/processor/transaction_processor_stub.hpp b/irohad/torii/processor/transaction_processor_stub.hpp
@@ -20,6 +20,7 @@
 
 #include <network/network_api.h>
 #include <model/model_crypto_provider.hpp>
+#include <model/transaction_response.hpp>
 #include <torii/processor/transaction_processor.hpp>
 #include <validation/stateless/validator.hpp>