Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qtils #249

Merged
merged 2 commits into from
May 29, 2024
Merged

qtils #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f714666
qtils
turuslan May 22, 2024
3f1e45b
hunter tag
turuslan May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/Hunter/init.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
3 changes: 3 additions & 0 deletions cmake/dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion include/libp2p/common/final_action.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <optional>
#include <utility>

#include <libp2p/common/option_take.hpp>
#include <qtils/option_take.hpp>

namespace libp2p::common {

Expand Down
62 changes: 0 additions & 62 deletions include/libp2p/common/hexutil.hpp
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions include/libp2p/common/option_take.hpp
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions include/libp2p/common/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down Expand Up @@ -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());
}

Expand Down
71 changes: 0 additions & 71 deletions include/libp2p/cxx20/lexicographical_compare_three_way.hpp
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions include/libp2p/multi/uvarint.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
122 changes: 0 additions & 122 deletions include/libp2p/outcome/outcome-register.hpp
View file
Open in desktop

This file was deleted.

Loading
Loading