Remove some dependencies

Signed-off-by: Victor Drobny <[email protected]>

CMakeLists.txt

@@ -86,12 +86,9 @@ if(PACKAGE_TGZ OR PACKAGE_ZIP OR PACKAGE_RPM OR PACKAGE_DEB)
   include(cmake/release.cmake)
 endif()
 
-set(SHARED_MODEL_DISABLE_COMPATIBILITY FALSE)
+set(SHARED_MODEL_DISABLE_COMPATIBILITY TRUE)
 if (SHARED_MODEL_DISABLE_COMPATIBILITY)
     add_definitions(-DDISABLE_BACKWARD)
-    set(shared_model_ed25519_sha3_LIBRARY shared_model_ed25519_sha3)
-else()
-    set(model_LIBRARY model)
 endif()
 
 add_subdirectory(schema)

irohad/consensus/yac/CMakeLists.txt

@@ -36,4 +36,5 @@ target_link_libraries(yac
     yac_grpc
     logger
     hash
+    pb_model_converters
     )

irohad/model/CMakeLists.txt

@@ -37,12 +37,12 @@ target_link_libraries(command_execution
     )
 
 add_library(sha3_hash
-        sha3_hash.cpp
-        )
+    sha3_hash.cpp
+    )
 
 target_link_libraries(sha3_hash
-        pb_model_converters
-        )
+    pb_model_converters
+    )
 
 add_library(model
     model_crypto_provider_impl.cpp

irohad/model/sha3_hash.cpp

@@ -21,24 +21,24 @@
 #include "converters/pb_transaction_factory.hpp"
 
 namespace iroha {
-// TODO: remove factories
-    const static model::converters::PbTransactionFactory tx_factory;
-    const static model::converters::PbBlockFactory block_factory;
-    const static model::converters::PbQueryFactory query_factory;
+  // TODO: 24.01.2018 @victordrobny: remove factories IR-850
+  const static model::converters::PbTransactionFactory tx_factory;
+  const static model::converters::PbBlockFactory block_factory;
+  const static model::converters::PbQueryFactory query_factory;
 
-    hash256_t hash(const model::Transaction &tx) {
-        auto &&pb_dat = tx_factory.serialize(tx);
-        return hash(pb_dat);
-    }
+  hash256_t hash(const model::Transaction &tx) {
+    auto &&pb_dat = tx_factory.serialize(tx);
+    return hash(pb_dat);
+  }
 
-    hash256_t hash(const model::Block &block) {
-        auto &&pb_dat = block_factory.serialize(block);
-        return hash(pb_dat);
-    }
+  hash256_t hash(const model::Block &block) {
+    auto &&pb_dat = block_factory.serialize(block);
+    return hash(pb_dat);
+  }
 
-    hash256_t hash(const model::Query &query) {
-        std::shared_ptr<const model::Query> qptr(&query, [](auto) {});
-        auto &&pb_dat = query_factory.serialize(qptr);
-        return hash(*pb_dat);
-    }
-}
+  hash256_t hash(const model::Query &query) {
+    std::shared_ptr<const model::Query> qptr(&query, [](auto) {});
+    auto &&pb_dat = query_factory.serialize(qptr);
+    return hash(*pb_dat);
+  }
+}

libs/crypto/CMakeLists.txt

@@ -21,6 +21,9 @@ add_library(keys_manager
     )
 
 target_link_libraries(keys_manager
+#    logger
     optional
     cryptography
+    pb_model_converters
+#    ${Boost_LIBRARIES}
     )

shared_model/CMakeLists.txt

@@ -12,6 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+add_library(old_model INTERFACE)
+
+if (NOT SHARED_MODEL_DISABLE_COMPATIBILITY)
+    target_link_libraries(old_model INTERFACE
+        model
+        )
+endif()
+
 add_subdirectory(backend)
 add_subdirectory(bindings)
 add_subdirectory(builders)

shared_model/cryptography/ed25519_sha3_impl/internal/CMakeLists.txt

@@ -21,7 +21,6 @@ add_library(hash
 
 target_link_libraries(hash
         common
-        pb_model_converters
         ed25519
         )
 
@@ -30,6 +29,6 @@ add_library(cryptography
         )
 
 target_link_libraries(cryptography
-        ed25519
+#        ed25519
         hash
         )

shared_model/interfaces/CMakeLists.txt

@@ -17,8 +17,8 @@ add_library(model_interfaces
     )
 
 target_link_libraries(model_interfaces
-    ${model_LIBRARY}
-    ${shared_model_ed25519_sha3_LIBRARY}
+    old_model
+    shared_model_ed25519_sha3
     optional
     rxcpp
     ${Boost_LIBRARIES}

test/module/shared_model/backend_proto/CMakeLists.txt

@@ -36,6 +36,7 @@ target_link_libraries(shared_proto_transaction_test
     shared_model_proto_backend
     shared_model_ed25519_sha3
     shared_model_stateless_validation
+    iroha_amount
     )
 
 addtest(shared_proto_queries_test