refactor (for qtils) (#225)

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

Author: turuslan

.github/workflows/ci.yml

@@ -9,43 +9,36 @@ on:
     - master
 
 jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        # 3 jobs in total
-        os: [ubuntu-latest, macos-latest]
-        compiler: [{
-          "cc": "gcc",
-          "cxx": "g++"
-         }, {
-          "cc": "clang",
-          "cxx": "clang++"
-        }]
-        exclude:
-          - os: macos-latest
-            compiler:
-              cc: gcc
+  MacOS:
+    runs-on: macos-14
     steps:
-    - uses: actions/checkout@v1
-      name: checkout
-      with:
-        submodules: true
-        clean: true
-        fetch-depth: 1
-    - name: install dependencies
+    - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
+    - name: venv
+      run: python3 -m venv --upgrade-deps ~/venv && housekeeping/github_venv.sh $_
+    - name: install
       run: |
-        set -e
-
-        sudo python3 -m pip install --upgrade pip
-        sudo pip3 install scikit-build
-        sudo pip3 install cmake=="3.25.0" requests gitpython gcovr pyyaml
+        pip3 install scikit-build
+        pip3 install cmake==3.25 requests gitpython gcovr
+        brew install ninja
     - name: cmake
       env:
-        CC: ${{ matrix.compiler.cc }}
-        CXX: ${{ matrix.compiler.cxx }}
-      run: cmake . -Bbuild
+        CURL_SSL_BACKEND: SecureTransport
+      run: cmake -G Ninja -B build .
+    - name: build
+      run: cmake --build build -- -j4
+    - name: test
+      env:
+        CTEST_OUTPUT_ON_FAILURE: 1
+      run: cmake --build build --target test
+  Linux-gcc:
+    runs-on: ubuntu-latest
+    container: qdrvm/kagome-dev@sha256:2d70246c32418a3dd45c246d3f5c2dd99bdafde145b903271849affe476c4cfc
+    steps:
+    - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
+    - name: venv
+      run: housekeeping/github_venv.sh /venv
+    - name: cmake
+      run: cmake -B build .
     - name: build
       run: cmake --build build -- -j4
     - name: test

.github/workflows/clang-tidy.yml

@@ -10,32 +10,20 @@ on:
 
 jobs:
   build:
-    runs-on: macOS-latest
+    runs-on: ubuntu-latest
+    container: qdrvm/kagome-dev@sha256:2d70246c32418a3dd45c246d3f5c2dd99bdafde145b903271849affe476c4cfc
     steps:
-    - uses: actions/checkout@v1
-      name: checkout
+    - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
       with:
-        submodules: true
-        clean: true
-        fetch-depth: 1
-    - name: install
-      run: |
-        brew install ninja llvm
-        sudo python3 -m pip install --upgrade pip
-        sudo python3 -m pip install scikit-build 
-        sudo python3 -m pip install cmake requests gitpython gcovr pyyaml
+        fetch-depth: 0
+    - name: venv
+      run: housekeeping/github_venv.sh /venv
     - name: run checks
+      env:
+        BUILD_DIR: build
       run: |
-        #!/bin/bash
-        LLVM_DIR=/usr/local/Cellar/llvm
-        test -d $LLVM_DIR || echo $(echo "llvm is absent, cannot continue" && exit 1)
-        VER_COUNT=$(ls -1 ${LLVM_DIR} | wc -l)
-        test ${VER_COUNT} -eq 0 && echo "no llvm version detected" && exit 1
-        test $VER_COUNT -gt 1 && echo "wrong llvm installation" && exit 1
-        LLVM_VER=$(ls -1 ${LLVM_DIR})
-        export LLVM_ROOT=${LLVM_DIR}/${LLVM_VER}
-        export PATH=${LLVM_ROOT}/bin:${LLVM_ROOT}/share/clang:${PATH}
-        cmake . -GNinja -Bbuild
-        cmake --build build --target generated
-        housekeeping/clang-tidy.sh build
+        cmake -B $BUILD_DIR .
+        cmake --build $BUILD_DIR --target generated
+        git config --global --add safe.directory $PWD
+        housekeeping/clang-tidy-diff.sh
 

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.23.257-qdrvm10.tar.gz
-    SHA1 72b446a4424ba28ea90f9a68a9134b0f8e44b5b2
+    URL  https://github.com/qdrvm/hunter/archive/refs/tags/v0.25.3-qdrvm6.zip
+    SHA1 5a911c0b567aba49a7140c1d2fe0e4b6769d070f
     LOCAL
 )

cmake/functions.cmake

@@ -29,9 +29,6 @@ function(addtest_part test_name)
   target_sources(${test_name} PUBLIC
       ${ARGN}
       )
-  target_link_libraries(${test_name}
-      GTest::gtest
-      )
 endfunction()
 
 # conditionally applies flag. If flag is supported by current compiler, it will be added to compile options.

cmake/toolchain/clang-15_cxx17.cmake

@@ -52,8 +52,7 @@ int main(int argc, char *argv[]) {
       auto sz = static_cast<size_t>(n);
       jumbo_message.reserve(sz + 9);
       while (jumbo_message.size() < sz) {
-        jumbo_message.append(
-            fmt::format("[{:08}]", jumbo_message.size() + 10));
+        jumbo_message.append(fmt::format("[{:08}]", jumbo_message.size() + 10));
       }
       jumbo_message.resize(sz);
       message.swap(jumbo_message);
@@ -106,14 +105,17 @@ int main(int argc, char *argv[]) {
   auto sch = injector.create<std::shared_ptr<libp2p::basic::Scheduler>>();
 
   context->post(
-      [log, host{std::move(host)}, &echo, &message,
+      [log,
+       host{std::move(host)},
+       &echo,
+       &message,
        argv,  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
        sch] {
         auto server_ma_res =
             libp2p::multi::Multiaddress::create(argv[1]);  // NOLINT
         if (!server_ma_res) {
           log->error("unable to create server multiaddress: {}",
-                     server_ma_res.error().message());
+                     server_ma_res.error());
           std::exit(EXIT_FAILURE);
         }
         const auto &server_ma = server_ma_res.value();
@@ -128,7 +130,7 @@ int main(int argc, char *argv[]) {
             libp2p::peer::PeerId::fromBase58(*server_peer_id_str);
         if (!server_peer_id_res) {
           log->error("Unable to decode peer id from base 58: {}",
-                     server_peer_id_res.error().message());
+                     server_peer_id_res.error());
           std::exit(EXIT_FAILURE);
         }
 
@@ -138,11 +140,11 @@ int main(int argc, char *argv[]) {
 
         // create Host object and open a stream through it
         host->newStream(
-            peer_info, {echo.getProtocolId()},
+            peer_info,
+            {echo.getProtocolId()},
             [log, &echo, &message, sch](auto &&stream_res) {
               if (!stream_res) {
-                log->error("Cannot connect to server: {}",
-                           stream_res.error().message());
+                log->error("Cannot connect to server: {}", stream_res.error());
                 std::exit(EXIT_FAILURE);
               }
 
@@ -164,7 +166,7 @@ int main(int argc, char *argv[]) {
                          stream = std::move(stream)](auto &&response_result) {
                           if (response_result.has_error()) {
                             log->info("Error happened: {}",
-                                      response_result.error().message());
+                                      response_result.error());
                             stream->close(
                                 [log](auto &&) { std::exit(EXIT_SUCCESS); });
                             return;

example/01-echo/libp2p_echo_client.cpp

@@ -49,7 +49,8 @@ struct SecureAdaptorProxy : libp2p::security::SecurityAdaptor {
 
   void secureOutbound(
       std::shared_ptr<libp2p::connection::LayerConnection> outbound,
-      const libp2p::peer::PeerId &p, SecConnCallbackFunc cb) override {
+      const libp2p::peer::PeerId &p,
+      SecConnCallbackFunc cb) override {
     return impl->secureOutbound(outbound, p, cb);
   }
 
@@ -176,15 +177,16 @@ dPtse4GVRA2swbXcZX5iFVi/V8poIpdVrgn5iMadkQnYf9APWJuGcebK
     auto listen_res = host->listen(ma);
     if (!listen_res) {
       log->error("host cannot listen the given multiaddress: {}",
-                 listen_res.error().message());
+                 listen_res.error());
       std::exit(EXIT_FAILURE);
     }
 
     host->start();
     log->info("Server started");
     log->info("Listening on: {}", ma.getStringAddress());
     log->info("Peer id: {}", host->getPeerInfo().id.toBase58());
-    log->info("Connection string: {}/p2p/{}", ma.getStringAddress(),
+    log->info("Connection string: {}/p2p/{}",
+              ma.getStringAddress(),
               host->getPeerInfo().id.toBase58());
   });
 
@@ -193,7 +195,7 @@ dPtse4GVRA2swbXcZX5iFVi/V8poIpdVrgn5iMadkQnYf9APWJuGcebK
     io_context->run();
     std::exit(EXIT_SUCCESS);
   } catch (const boost::system::error_code &ec) {
-    log->error("Server cannot run: {}", ec.message());
+    log->error("Server cannot run: {}", ec);
     std::exit(EXIT_FAILURE);
   } catch (...) {
     log->error("Unknown error happened");

example/01-echo/libp2p_echo_server.cpp

@@ -12,12 +12,14 @@
 #include <boost/beast.hpp>
 
 #include <libp2p/basic/write_return_size.hpp>
-#include <libp2p/common/hexutil.hpp>
+#include <libp2p/common/literals.hpp>
 #include <libp2p/injector/kademlia_injector.hpp>
 #include <libp2p/log/configurator.hpp>
 #include <libp2p/log/sublogger.hpp>
 #include <libp2p/multi/content_identifier_codec.hpp>
 
+using libp2p::common::operator""_unhex;
+
 class Session;
 
 struct Cmp {
@@ -46,7 +48,7 @@ class Session : public std::enable_shared_from_this<Session> {
     stream_->readSome(
         *incoming_,
         incoming_->size(),
-        [self = shared_from_this()](libp2p::outcome::result<size_t> result) {
+        [self = shared_from_this()](outcome::result<size_t> result) {
           if (not result) {
             self->close();
             std::cout << self->stream_->remotePeerId().value().toBase58()
@@ -71,8 +73,7 @@ class Session : public std::enable_shared_from_this<Session> {
     libp2p::writeReturnSize(
         stream_,
         *buffer,
-        [self = shared_from_this(),
-         buffer](libp2p::outcome::result<size_t> result) {
+        [self = shared_from_this(), buffer](outcome::result<size_t> result) {
           if (not result) {
             self->close();
             std::cout << self->stream_->remotePeerId().value().toBase58()
@@ -129,8 +130,8 @@ void handleIncomingStream(libp2p::StreamAndProtocol stream_and_protocol) {
 
 void handleOutgoingStream(libp2p::StreamAndProtocolOrError stream_res) {
   if (not stream_res) {
-    std::cerr << " ! outgoing connection failed: "
-              << stream_res.error().message() << std::endl;
+    fmt::println(
+        std::cerr, " ! outgoing connection failed: {}", stream_res.error());
     return;
   }
   auto &stream = stream_res.value().stream;
@@ -198,11 +199,11 @@ int main(int argc, char *argv[]) {
       // clang-format off
       .publicKey = {{
         .type = libp2p::crypto::Key::Type::Ed25519,
-        .data = libp2p::common::unhex("48453469c62f4885373099421a7365520b5ffb0d93726c124166be4b81d852e6").value()
+        .data = "48453469c62f4885373099421a7365520b5ffb0d93726c124166be4b81d852e6"_unhex,
       }},
       .privateKey = {{
         .type = libp2p::crypto::Key::Type::Ed25519,
-        .data = libp2p::common::unhex("4a9361c525840f7086b893d584ebbe475b4ec7069951d2e897e8bceb0a3f35ce").value()
+        .data = "4a9361c525840f7086b893d584ebbe475b4ec7069951d2e897e8bceb0a3f35ce"_unhex,
       }},
       // clang-format on
   };
@@ -291,14 +292,12 @@ int main(int argc, char *argv[]) {
       [[maybe_unused]] auto res1 = kademlia->findProviders(
           content_id,
           0,
-          [&](libp2p::outcome::result<std::vector<libp2p::peer::PeerInfo>>
-                  res) {
+          [&](outcome::result<std::vector<libp2p::peer::PeerInfo>> res) {
             scheduler.schedule(std::function{find_providers},
                                kademlia_config.randomWalk.interval);
 
             if (not res) {
-              std::cerr << "Cannot find providers: " << res.error().message()
-                        << std::endl;
+              fmt::println(std::cerr, "Cannot find providers: {}", res.error());
               return;
             }
 
@@ -320,8 +319,10 @@ int main(int argc, char *argv[]) {
     io->post([&] {
       auto listen = host->listen(ma);
       if (not listen) {
-        std::cerr << "Cannot listen address " << ma.getStringAddress().data()
-                  << ". Error: " << listen.error().message() << std::endl;
+        fmt::println(std::cerr,
+                     "Cannot listen address {}. Error: {}",
+                     ma.getStringAddress(),
+                     listen.error());
         std::exit(EXIT_FAILURE);
       }
 

example/02-kademlia/rendezvous_chat.cpp

@@ -21,7 +21,9 @@ namespace libp2p::protocol::example::utility {
   void ConsoleAsyncReader::read() {
     input_.consume(input_.data().size());
     boost::asio::async_read_until(
-        in_, input_, "\n",
+        in_,
+        input_,
+        "\n",
         [this](const boost::system::error_code &e, std::size_t size) {
           onRead(e, size);
         });

example/03-gossip/console_async_reader.cpp

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <string>
 #include <functional>
+#include <string>
 
 #include <boost/asio.hpp>
 
@@ -39,4 +39,4 @@ namespace libp2p::protocol::example::utility {
     bool stopped_ = false;
   };
 
-} //namespace libp2p::protocol::example::utility
+}  // namespace libp2p::protocol::example::utility