qtils (#249)

- outcome - hex, unhex - lexicographical_compare_three_way - optionTake - append, bytestr Signed-off-by: turuslan <turuslan.devbox@gmail.com>
libp2p · May 29, 2024 · 2e37528 · 2e37528
1 parent c319206
commit 2e37528
Show file tree

Hide file tree

Showing 32 changed files with 55 additions and 707 deletions.
diff --git a/cmake/Hunter/init.cmake b/cmake/Hunter/init.cmake
@@ -31,7 +31,7 @@ set(
 include(${CMAKE_CURRENT_LIST_DIR}/HunterGate.cmake)
 
 HunterGate(
-    URL  https://github.com/qdrvm/hunter/archive/refs/tags/v0.25.3-qdrvm9.zip
-    SHA1 7f3f8ee341aaac8c400e776c8a9f28e8fc458296
+    URL  https://github.com/qdrvm/hunter/archive/refs/tags/v0.25.3-qdrvm12.zip
+    SHA1 9d4b9844b84d3dfbf4a90923eedb3875718abf54
     LOCAL
 )
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -22,6 +22,9 @@ find_package(OpenSSL REQUIRED)
 hunter_add_package(Protobuf)
 find_package(Protobuf CONFIG REQUIRED)
 
+hunter_add_package(qtils)
+find_package(qtils CONFIG REQUIRED)
+
 find_package(Threads)
 
 hunter_add_package(c-ares)

diff --git a/include/libp2p/common/final_action.hpp b/include/libp2p/common/final_action.hpp
@@ -10,7 +10,7 @@
 #include <optional>
 #include <utility>
 
-#include <libp2p/common/option_take.hpp>
+#include <qtils/option_take.hpp>
 
 namespace libp2p::common {
 

diff --git a/include/libp2p/common/hexutil.hpp b/include/libp2p/common/hexutil.hpp
diff --git a/include/libp2p/common/option_take.hpp b/include/libp2p/common/option_take.hpp
diff --git a/include/libp2p/common/types.hpp b/include/libp2p/common/types.hpp
@@ -8,11 +8,10 @@
 
 #include <array>
 #include <cstdint>
+#include <qtils/cxx20/lexicographical_compare_three_way.hpp>
 #include <span>
 #include <vector>
 
-#include <libp2p/cxx20/lexicographical_compare_three_way.hpp>
-
 namespace libp2p::common {
   /// Hash160 as a sequence of 20 bytes
   using Hash160 = std::array<uint8_t, 20u>;
@@ -44,7 +43,7 @@ namespace libp2p {
 
   inline auto operator<=>(const SpanOfBytes auto &lhs,
                           const SpanOfBytes auto &rhs) {
-    return cxx20::lexicographical_compare_three_way(
+    return qtils::cxx20::lexicographical_compare_three_way(
         lhs.begin(), lhs.end(), rhs.begin(), rhs.end());
   }
 

diff --git a/include/libp2p/cxx20/lexicographical_compare_three_way.hpp b/include/libp2p/cxx20/lexicographical_compare_three_way.hpp
diff --git a/include/libp2p/multi/uvarint.hpp b/include/libp2p/multi/uvarint.hpp
@@ -57,8 +57,6 @@ namespace libp2p::multi {
 
     const std::vector<uint8_t> &toVector() const;
 
-    std::string toHex() const;
-
     /**
      * Assigns the varint to an unsigned integer, encoding the latter
      * @param n the integer to encode and store

diff --git a/include/libp2p/outcome/outcome-register.hpp b/include/libp2p/outcome/outcome-register.hpp