Refactor Outcome target (#6)

Signed-off-by: Harrm <[email protected]>

Author: Harrm

core/common/CMakeLists.txt

@@ -20,6 +20,12 @@ target_link_libraries(blob
     hexutil
     )
 
+add_library(outcome INTERFACE)
+target_link_libraries(outcome INTERFACE
+    Boost::boost
+    p2p::p2p
+    )
+
 add_library(buffer
     buffer.hpp
     buffer.cpp

core/common/buffer.hpp

@@ -9,9 +9,9 @@
 #include <boost/container_hash/hash.hpp>
 #include <boost/operators.hpp>
 #include <gsl/span>
-#include <outcome/outcome.hpp>
 #include <string_view>
 #include <vector>
+#include "common/outcome.hpp"
 
 namespace fc::common {
 

core/common/hexutil.hpp

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include <gsl/span>
-#include <outcome/outcome.hpp>
+#include "common/outcome.hpp"
 
 namespace fc::common {
 

deps/outcome/outcome/outcome.hpp renamed to core/common/outcome.hpp

@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef CPP_FILECOIN_DEPS_OUTCOME_OUTCOME_OUTCOME_HPP
-#define CPP_FILECOIN_DEPS_OUTCOME_OUTCOME_OUTCOME_HPP
+#ifndef CPP_FILECOIN_CORE_COMMON_OUTCOME_HPP
+#define CPP_FILECOIN_CORE_COMMON_OUTCOME_HPP
 
 #include <libp2p/outcome/outcome.hpp>
 
-namespace outcome {
+namespace fc::outcome {
   using libp2p::outcome::failure;
   using libp2p::outcome::result;
   using libp2p::outcome::success;
-}  // namespace outcome
+}  // namespace fc::outcome
 
-#endif  // CPP_FILECOIN_DEPS_OUTCOME_OUTCOME_OUTCOME_HPP
+#endif // CPP_FILECOIN_CORE_COMMON_OUTCOME_HPP

core/storage/face/readable_map.hpp

@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_READABLE_MAP_HPP
 #define CPP_FILECOIN_READABLE_MAP_HPP
 
-#include <outcome/outcome.hpp>
+#include "common/outcome.hpp"
 #include "storage/face/map_cursor.hpp"
 
 namespace fc::storage::face {

core/storage/face/writeable_map.hpp

@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_WRITEABLE_MAP_HPP
 #define CPP_FILECOIN_WRITEABLE_MAP_HPP
 
-#include <outcome/outcome.hpp>
+#include "common/outcome.hpp"
 
 namespace fc::storage::face {
 

core/storage/in_memory/in_memory_storage.hpp

@@ -8,7 +8,7 @@
 
 #include <memory>
 
-#include <outcome/outcome.hpp>
+#include "common/outcome.hpp"
 #include "common/buffer.hpp"
 #include "storage/face/persistent_map.hpp"
 

core/storage/leveldb/leveldb_error.hpp

@@ -6,7 +6,7 @@
 #ifndef CPP_FILECOIN_LEVELDB_ERROR_HPP
 #define CPP_FILECOIN_LEVELDB_ERROR_HPP
 
-#include <outcome/outcome.hpp>
+#include "common/outcome.hpp"
 
 namespace fc::storage {
 

core/storage/leveldb/leveldb_util.hpp

@@ -8,7 +8,7 @@
 
 #include <leveldb/status.h>
 #include <gsl/span>
-#include <outcome/outcome.hpp>
+#include "common/outcome.hpp"
 #include "common/buffer.hpp"
 #include "common/logger.hpp"
 #include "storage/leveldb/leveldb_error.hpp"

deps/CMakeLists.txt

@@ -2,5 +2,3 @@
 # Copyright Soramitsu Co., Ltd. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 #
-
-add_subdirectory(outcome)

deps/outcome/CMakeLists.txt

@@ -1,11 +0,0 @@
-#
-# Copyright Soramitsu Co., Ltd. All Rights Reserved.
-# SPDX-License-Identifier: Apache-2.0
-#
-
-add_library(outcome INTERFACE IMPORTED GLOBAL)
-set_target_properties(outcome PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}
-    INTERFACE_LINK_LIBRARIES Boost::boost
-    INTERFACE_LINK_LIBRARIES p2p::p2p
-    )

test/testutil/outcome.hpp

@@ -7,7 +7,7 @@
 #define CPP_FILECOIN_GTEST_OUTCOME_UTIL_HPP
 
 #include <gtest/gtest.h>
-#include <outcome/outcome.hpp>
+#include "common/outcome.hpp"
 #include "common/visitor.hpp"
 
 #define PP_CAT(a, b) PP_CAT_I(a, b)