Skip to content

Commit f128f56

Browse files
turuslanturuslan
authored
refactor (for qtils) (#225)
Signed-off-by: turuslan <[email protected]>
1 parent 3cdf68a commit f128f56

File tree

189 files changed

+744
-1455
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+744
-1455
lines changed

‎.github/workflows/ci.yml

+26-33
Original file line numberDiff line numberDiff line change
@@ -9,43 +9,36 @@ on:
99
- master
1010

1111
jobs:
12-
build:
13-
runs-on: ${{ matrix.os }}
14-
strategy:
15-
fail-fast: false
16-
matrix:
17-
# 3 jobs in total
18-
os: [ubuntu-latest, macos-latest]
19-
compiler: [{
20-
"cc": "gcc",
21-
"cxx": "g++"
22-
}, {
23-
"cc": "clang",
24-
"cxx": "clang++"
25-
}]
26-
exclude:
27-
- os: macos-latest
28-
compiler:
29-
cc: gcc
12+
MacOS:
13+
runs-on: macos-14
3014
steps:
31-
- uses: actions/checkout@v1
32-
name: checkout
33-
with:
34-
submodules: true
35-
clean: true
36-
fetch-depth: 1
37-
- name: install dependencies
15+
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
16+
- name: venv
17+
run: python3 -m venv --upgrade-deps ~/venv && housekeeping/github_venv.sh $_
18+
- name: install
3819
run: |
39-
set -e
40-
41-
sudo python3 -m pip install --upgrade pip
42-
sudo pip3 install scikit-build
43-
sudo pip3 install cmake=="3.25.0" requests gitpython gcovr pyyaml
20+
pip3 install scikit-build
21+
pip3 install cmake==3.25 requests gitpython gcovr
22+
brew install ninja
4423
- name: cmake
4524
env:
46-
CC: ${{ matrix.compiler.cc }}
47-
CXX: ${{ matrix.compiler.cxx }}
48-
run: cmake . -Bbuild
25+
CURL_SSL_BACKEND: SecureTransport
26+
run: cmake -G Ninja -B build .
27+
- name: build
28+
run: cmake --build build -- -j4
29+
- name: test
30+
env:
31+
CTEST_OUTPUT_ON_FAILURE: 1
32+
run: cmake --build build --target test
33+
Linux-gcc:
34+
runs-on: ubuntu-latest
35+
container: qdrvm/kagome-dev@sha256:2d70246c32418a3dd45c246d3f5c2dd99bdafde145b903271849affe476c4cfc
36+
steps:
37+
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
38+
- name: venv
39+
run: housekeeping/github_venv.sh /venv
40+
- name: cmake
41+
run: cmake -B build .
4942
- name: build
5043
run: cmake --build build -- -j4
5144
- name: test

‎.github/workflows/clang-tidy.yml

+12-24
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,20 @@ on:
1010

1111
jobs:
1212
build:
13-
runs-on: macOS-latest
13+
runs-on: ubuntu-latest
14+
container: qdrvm/kagome-dev@sha256:2d70246c32418a3dd45c246d3f5c2dd99bdafde145b903271849affe476c4cfc
1415
steps:
15-
- uses: actions/checkout@v1
16-
name: checkout
16+
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
1717
with:
18-
submodules: true
19-
clean: true
20-
fetch-depth: 1
21-
- name: install
22-
run: |
23-
brew install ninja llvm
24-
sudo python3 -m pip install --upgrade pip
25-
sudo python3 -m pip install scikit-build
26-
sudo python3 -m pip install cmake requests gitpython gcovr pyyaml
18+
fetch-depth: 0
19+
- name: venv
20+
run: housekeeping/github_venv.sh /venv
2721
- name: run checks
22+
env:
23+
BUILD_DIR: build
2824
run: |
29-
#!/bin/bash
30-
LLVM_DIR=/usr/local/Cellar/llvm
31-
test -d $LLVM_DIR || echo $(echo "llvm is absent, cannot continue" && exit 1)
32-
VER_COUNT=$(ls -1 ${LLVM_DIR} | wc -l)
33-
test ${VER_COUNT} -eq 0 && echo "no llvm version detected" && exit 1
34-
test $VER_COUNT -gt 1 && echo "wrong llvm installation" && exit 1
35-
LLVM_VER=$(ls -1 ${LLVM_DIR})
36-
export LLVM_ROOT=${LLVM_DIR}/${LLVM_VER}
37-
export PATH=${LLVM_ROOT}/bin:${LLVM_ROOT}/share/clang:${PATH}
38-
cmake . -GNinja -Bbuild
39-
cmake --build build --target generated
40-
housekeeping/clang-tidy.sh build
25+
cmake -B $BUILD_DIR .
26+
cmake --build $BUILD_DIR --target generated
27+
git config --global --add safe.directory $PWD
28+
housekeeping/clang-tidy-diff.sh
4129

‎cmake/Hunter/init.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ set(
3131
include(${CMAKE_CURRENT_LIST_DIR}/HunterGate.cmake)
3232

3333
HunterGate(
34-
URL https://github.com/qdrvm/hunter/archive/refs/tags/v0.23.257-qdrvm10.tar.gz
35-
SHA1 72b446a4424ba28ea90f9a68a9134b0f8e44b5b2
34+
URL https://github.com/qdrvm/hunter/archive/refs/tags/v0.25.3-qdrvm6.zip
35+
SHA1 5a911c0b567aba49a7140c1d2fe0e4b6769d070f
3636
LOCAL
3737
)

‎cmake/functions.cmake

-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ function(addtest_part test_name)
2929
target_sources(${test_name} PUBLIC
3030
${ARGN}
3131
)
32-
target_link_libraries(${test_name}
33-
GTest::gtest
34-
)
3532
endfunction()
3633

3734
# conditionally applies flag. If flag is supported by current compiler, it will be added to compile options.

‎cmake/toolchain/clang-15_cxx17.cmake

-3
This file was deleted.

‎example/01-echo/libp2p_echo_client.cpp

+11-9
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ int main(int argc, char *argv[]) {
5252
auto sz = static_cast<size_t>(n);
5353
jumbo_message.reserve(sz + 9);
5454
while (jumbo_message.size() < sz) {
55-
jumbo_message.append(
56-
fmt::format("[{:08}]", jumbo_message.size() + 10));
55+
jumbo_message.append(fmt::format("[{:08}]", jumbo_message.size() + 10));
5756
}
5857
jumbo_message.resize(sz);
5958
message.swap(jumbo_message);
@@ -106,14 +105,17 @@ int main(int argc, char *argv[]) {
106105
auto sch = injector.create<std::shared_ptr<libp2p::basic::Scheduler>>();
107106

108107
context->post(
109-
[log, host{std::move(host)}, &echo, &message,
108+
[log,
109+
host{std::move(host)},
110+
&echo,
111+
&message,
110112
argv, // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
111113
sch] {
112114
auto server_ma_res =
113115
libp2p::multi::Multiaddress::create(argv[1]); // NOLINT
114116
if (!server_ma_res) {
115117
log->error("unable to create server multiaddress: {}",
116-
server_ma_res.error().message());
118+
server_ma_res.error());
117119
std::exit(EXIT_FAILURE);
118120
}
119121
const auto &server_ma = server_ma_res.value();
@@ -128,7 +130,7 @@ int main(int argc, char *argv[]) {
128130
libp2p::peer::PeerId::fromBase58(*server_peer_id_str);
129131
if (!server_peer_id_res) {
130132
log->error("Unable to decode peer id from base 58: {}",
131-
server_peer_id_res.error().message());
133+
server_peer_id_res.error());
132134
std::exit(EXIT_FAILURE);
133135
}
134136

@@ -138,11 +140,11 @@ int main(int argc, char *argv[]) {
138140

139141
// create Host object and open a stream through it
140142
host->newStream(
141-
peer_info, {echo.getProtocolId()},
143+
peer_info,
144+
{echo.getProtocolId()},
142145
[log, &echo, &message, sch](auto &&stream_res) {
143146
if (!stream_res) {
144-
log->error("Cannot connect to server: {}",
145-
stream_res.error().message());
147+
log->error("Cannot connect to server: {}", stream_res.error());
146148
std::exit(EXIT_FAILURE);
147149
}
148150

@@ -164,7 +166,7 @@ int main(int argc, char *argv[]) {
164166
stream = std::move(stream)](auto &&response_result) {
165167
if (response_result.has_error()) {
166168
log->info("Error happened: {}",
167-
response_result.error().message());
169+
response_result.error());
168170
stream->close(
169171
[log](auto &&) { std::exit(EXIT_SUCCESS); });
170172
return;

‎example/01-echo/libp2p_echo_server.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ struct SecureAdaptorProxy : libp2p::security::SecurityAdaptor {
4949

5050
void secureOutbound(
5151
std::shared_ptr<libp2p::connection::LayerConnection> outbound,
52-
const libp2p::peer::PeerId &p, SecConnCallbackFunc cb) override {
52+
const libp2p::peer::PeerId &p,
53+
SecConnCallbackFunc cb) override {
5354
return impl->secureOutbound(outbound, p, cb);
5455
}
5556

@@ -176,15 +177,16 @@ dPtse4GVRA2swbXcZX5iFVi/V8poIpdVrgn5iMadkQnYf9APWJuGcebK
176177
auto listen_res = host->listen(ma);
177178
if (!listen_res) {
178179
log->error("host cannot listen the given multiaddress: {}",
179-
listen_res.error().message());
180+
listen_res.error());
180181
std::exit(EXIT_FAILURE);
181182
}
182183

183184
host->start();
184185
log->info("Server started");
185186
log->info("Listening on: {}", ma.getStringAddress());
186187
log->info("Peer id: {}", host->getPeerInfo().id.toBase58());
187-
log->info("Connection string: {}/p2p/{}", ma.getStringAddress(),
188+
log->info("Connection string: {}/p2p/{}",
189+
ma.getStringAddress(),
188190
host->getPeerInfo().id.toBase58());
189191
});
190192

@@ -193,7 +195,7 @@ dPtse4GVRA2swbXcZX5iFVi/V8poIpdVrgn5iMadkQnYf9APWJuGcebK
193195
io_context->run();
194196
std::exit(EXIT_SUCCESS);
195197
} catch (const boost::system::error_code &ec) {
196-
log->error("Server cannot run: {}", ec.message());
198+
log->error("Server cannot run: {}", ec);
197199
std::exit(EXIT_FAILURE);
198200
} catch (...) {
199201
log->error("Unknown error happened");

‎example/02-kademlia/rendezvous_chat.cpp

+15-14
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
#include <boost/beast.hpp>
1313

1414
#include <libp2p/basic/write_return_size.hpp>
15-
#include <libp2p/common/hexutil.hpp>
15+
#include <libp2p/common/literals.hpp>
1616
#include <libp2p/injector/kademlia_injector.hpp>
1717
#include <libp2p/log/configurator.hpp>
1818
#include <libp2p/log/sublogger.hpp>
1919
#include <libp2p/multi/content_identifier_codec.hpp>
2020

21+
using libp2p::common::operator""_unhex;
22+
2123
class Session;
2224

2325
struct Cmp {
@@ -46,7 +48,7 @@ class Session : public std::enable_shared_from_this<Session> {
4648
stream_->readSome(
4749
*incoming_,
4850
incoming_->size(),
49-
[self = shared_from_this()](libp2p::outcome::result<size_t> result) {
51+
[self = shared_from_this()](outcome::result<size_t> result) {
5052
if (not result) {
5153
self->close();
5254
std::cout << self->stream_->remotePeerId().value().toBase58()
@@ -71,8 +73,7 @@ class Session : public std::enable_shared_from_this<Session> {
7173
libp2p::writeReturnSize(
7274
stream_,
7375
*buffer,
74-
[self = shared_from_this(),
75-
buffer](libp2p::outcome::result<size_t> result) {
76+
[self = shared_from_this(), buffer](outcome::result<size_t> result) {
7677
if (not result) {
7778
self->close();
7879
std::cout << self->stream_->remotePeerId().value().toBase58()
@@ -129,8 +130,8 @@ void handleIncomingStream(libp2p::StreamAndProtocol stream_and_protocol) {
129130

130131
void handleOutgoingStream(libp2p::StreamAndProtocolOrError stream_res) {
131132
if (not stream_res) {
132-
std::cerr << " ! outgoing connection failed: "
133-
<< stream_res.error().message() << std::endl;
133+
fmt::println(
134+
std::cerr, " ! outgoing connection failed: {}", stream_res.error());
134135
return;
135136
}
136137
auto &stream = stream_res.value().stream;
@@ -198,11 +199,11 @@ int main(int argc, char *argv[]) {
198199
// clang-format off
199200
.publicKey = {{
200201
.type = libp2p::crypto::Key::Type::Ed25519,
201-
.data = libp2p::common::unhex("48453469c62f4885373099421a7365520b5ffb0d93726c124166be4b81d852e6").value()
202+
.data = "48453469c62f4885373099421a7365520b5ffb0d93726c124166be4b81d852e6"_unhex,
202203
}},
203204
.privateKey = {{
204205
.type = libp2p::crypto::Key::Type::Ed25519,
205-
.data = libp2p::common::unhex("4a9361c525840f7086b893d584ebbe475b4ec7069951d2e897e8bceb0a3f35ce").value()
206+
.data = "4a9361c525840f7086b893d584ebbe475b4ec7069951d2e897e8bceb0a3f35ce"_unhex,
206207
}},
207208
// clang-format on
208209
};
@@ -291,14 +292,12 @@ int main(int argc, char *argv[]) {
291292
[[maybe_unused]] auto res1 = kademlia->findProviders(
292293
content_id,
293294
0,
294-
[&](libp2p::outcome::result<std::vector<libp2p::peer::PeerInfo>>
295-
res) {
295+
[&](outcome::result<std::vector<libp2p::peer::PeerInfo>> res) {
296296
scheduler.schedule(std::function{find_providers},
297297
kademlia_config.randomWalk.interval);
298298

299299
if (not res) {
300-
std::cerr << "Cannot find providers: " << res.error().message()
301-
<< std::endl;
300+
fmt::println(std::cerr, "Cannot find providers: {}", res.error());
302301
return;
303302
}
304303

@@ -320,8 +319,10 @@ int main(int argc, char *argv[]) {
320319
io->post([&] {
321320
auto listen = host->listen(ma);
322321
if (not listen) {
323-
std::cerr << "Cannot listen address " << ma.getStringAddress().data()
324-
<< ". Error: " << listen.error().message() << std::endl;
322+
fmt::println(std::cerr,
323+
"Cannot listen address {}. Error: {}",
324+
ma.getStringAddress(),
325+
listen.error());
325326
std::exit(EXIT_FAILURE);
326327
}
327328

‎example/03-gossip/console_async_reader.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ namespace libp2p::protocol::example::utility {
2121
void ConsoleAsyncReader::read() {
2222
input_.consume(input_.data().size());
2323
boost::asio::async_read_until(
24-
in_, input_, "\n",
24+
in_,
25+
input_,
26+
"\n",
2527
[this](const boost::system::error_code &e, std::size_t size) {
2628
onRead(e, size);
2729
});

‎example/03-gossip/console_async_reader.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
#pragma once
88

9-
#include <string>
109
#include <functional>
10+
#include <string>
1111

1212
#include <boost/asio.hpp>
1313

@@ -39,4 +39,4 @@ namespace libp2p::protocol::example::utility {
3939
bool stopped_ = false;
4040
};
4141

42-
} //namespace libp2p::protocol::example::utility
42+
} // namespace libp2p::protocol::example::utility

‎example/03-gossip/gossip_chat_example.cpp

+10-7
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,10 @@ int main(int argc, char *argv[]) {
9797
auto host = injector.create<std::shared_ptr<libp2p::Host>>();
9898

9999
// make peer uri of local node
100-
auto local_address_str =
101-
fmt::format("/ip4/{}/tcp/{}/p2p/{}", utility::getLocalIP(*io),
102-
options->port, host->getId().toBase58());
100+
auto local_address_str = fmt::format("/ip4/{}/tcp/{}/p2p/{}",
101+
utility::getLocalIP(*io),
102+
options->port,
103+
host->getId().toBase58());
103104

104105
// local address -> peer info
105106
auto peer_info = utility::str2peerInfo(local_address_str);
@@ -113,7 +114,8 @@ int main(int argc, char *argv[]) {
113114

114115
// create gossip node
115116
auto gossip = libp2p::protocol::gossip::create(
116-
injector.create<std::shared_ptr<libp2p::basic::Scheduler>>(), host,
117+
injector.create<std::shared_ptr<libp2p::basic::Scheduler>>(),
118+
host,
117119
injector.create<std::shared_ptr<libp2p::peer::IdentityManager>>(),
118120
injector.create<std::shared_ptr<libp2p::crypto::CryptoProvider>>(),
119121
injector
@@ -144,9 +146,10 @@ int main(int argc, char *argv[]) {
144146
io->post([&] {
145147
auto listen_res = host->listen(peer_info->addresses[0]);
146148
if (!listen_res) {
147-
std::cerr << "Cannot listen to multiaddress "
148-
<< peer_info->addresses[0].getStringAddress() << ", "
149-
<< listen_res.error().message() << "\n";
149+
fmt::println(std::cerr,
150+
"Cannot listen to multiaddress {}, {}",
151+
peer_info->addresses[0].getStringAddress(),
152+
listen_res.error());
150153
io->stop();
151154
return;
152155
}

0 commit comments

Comments
 (0)