From 4285801d69b0c08f941dd44c5bbc3d5dd9306821 Mon Sep 17 00:00:00 2001 From: Eduardo Menges Mattje Date: Sat, 14 Mar 2026 11:16:26 -0300 Subject: [PATCH] Reformated files --- example/00-vcpkg-install/main.cpp | 4 +- example/02-kademlia/rendezvous_chat.cpp | 2 +- .../libp2p/common/metrics/instance_count.hpp | 8 ++- .../libp2p/common/metrics/instance_list.hpp | 58 +++++++++---------- include/libp2p/event/emitter.hpp | 8 +-- .../multi/multiaddress_protocol_list.hpp | 8 +-- include/libp2p/peer/peer_id.hpp | 4 +- .../protocol/kademlia/impl/kademlia_impl.hpp | 6 +- src/basic/protobuf_message_read_writer.cpp | 2 +- src/multi/multibase_codec/codecs/base64.cpp | 2 +- src/protocol/kademlia/impl/kademlia_impl.cpp | 40 +++++++------ src/protocol/kademlia/impl/storage_impl.cpp | 6 +- src/security/secio/secio_dialer.cpp | 4 +- src/security/tls/tls_adaptor.cpp | 2 +- .../acceptance/p2p/host/peer/tick_counter.hpp | 3 +- .../libp2p/multi/utils/protocol_list_test.cpp | 5 +- .../inmem_address_repository_test.cpp | 21 ++++--- test/libp2p/peer/peer_id_test.cpp | 20 ++++--- .../transport/tcp/tcp_listener_test.cpp | 3 +- test/libp2p/transport/upgrader_test.cpp | 16 +++-- 20 files changed, 125 insertions(+), 97 deletions(-) diff --git a/example/00-vcpkg-install/main.cpp b/example/00-vcpkg-install/main.cpp index 1180388d4..b095a717b 100644 --- a/example/00-vcpkg-install/main.cpp +++ b/example/00-vcpkg-install/main.cpp @@ -5,8 +5,8 @@ int main() { auto ma_res = libp2p::multi::Multiaddress::create("/ip4/127.0.0.1/tcp/8080"); if (ma_res.has_value()) { - std::cout << "Created multiaddress: " - << ma_res.value().getStringAddress() << std::endl; + std::cout << "Created multiaddress: " << ma_res.value().getStringAddress() + << std::endl; } return 0; } \ No newline at end of file diff --git a/example/02-kademlia/rendezvous_chat.cpp b/example/02-kademlia/rendezvous_chat.cpp index 581d42e97..8365898ce 100644 --- a/example/02-kademlia/rendezvous_chat.cpp +++ b/example/02-kademlia/rendezvous_chat.cpp @@ -38,7 +38,7 @@ class Session : public std::enable_shared_from_this { public: explicit Session(std::shared_ptr stream) : stream_(std::move(stream)), - incoming_(std::make_shared>(1 << 12)) {}; + incoming_(std::make_shared>(1 << 12)){}; bool read() { if (stream_->isClosedForRead()) { diff --git a/include/libp2p/common/metrics/instance_count.hpp b/include/libp2p/common/metrics/instance_count.hpp index 5df764147..23e3e3606 100644 --- a/include/libp2p/common/metrics/instance_count.hpp +++ b/include/libp2p/common/metrics/instance_count.hpp @@ -21,11 +21,15 @@ })(); \ return count; \ } \ - Libp2pMetricsInstanceCount(const type *) { ++count(); } \ + Libp2pMetricsInstanceCount(const type *) { \ + ++count(); \ + } \ Libp2pMetricsInstanceCount(const Libp2pMetricsInstanceCount &) { \ ++count(); \ } \ - ~Libp2pMetricsInstanceCount() { --count(); } \ + ~Libp2pMetricsInstanceCount() { \ + --count(); \ + } \ } libp2p_metrics_instance_count { \ this \ } diff --git a/include/libp2p/common/metrics/instance_list.hpp b/include/libp2p/common/metrics/instance_list.hpp index db0b1a27a..6d1078d5f 100644 --- a/include/libp2p/common/metrics/instance_list.hpp +++ b/include/libp2p/common/metrics/instance_list.hpp @@ -9,35 +9,35 @@ #include #include -#define _LIBP2P_METRICS_INSTANCE_LIST(type) \ - struct Libp2pMetricsInstanceList { \ - using List = std::list; \ - struct State { \ - std::mutex mutex; \ - List list; \ - static auto &get() { \ - static State state; \ - return state; \ - } \ - }; \ - List::const_iterator it; \ - Libp2pMetricsInstanceList(const type *ptr) { \ - auto &state{State::get()}; \ - std::lock_guard lock{state.mutex}; \ - state.list.emplace_front(ptr); \ - it = state.list.begin(); \ - } \ - Libp2pMetricsInstanceList(const Libp2pMetricsInstanceList &list) \ - : Libp2pMetricsInstanceList{ \ - (const type *)((uintptr_t)*list.it + (this - &list))} {} \ - ~Libp2pMetricsInstanceList() { \ - auto &state{State::get()}; \ - std::lock_guard lock{state.mutex}; \ - state.list.erase(it); \ - } \ - void operator=(const Libp2pMetricsInstanceList &hook) {} \ - } libp2p_metrics_instance_list { \ - this \ +#define _LIBP2P_METRICS_INSTANCE_LIST(type) \ + struct Libp2pMetricsInstanceList { \ + using List = std::list; \ + struct State { \ + std::mutex mutex; \ + List list; \ + static auto &get() { \ + static State state; \ + return state; \ + } \ + }; \ + List::const_iterator it; \ + Libp2pMetricsInstanceList(const type *ptr) { \ + auto &state{State::get()}; \ + std::lock_guard lock{state.mutex}; \ + state.list.emplace_front(ptr); \ + it = state.list.begin(); \ + } \ + Libp2pMetricsInstanceList(const Libp2pMetricsInstanceList &list) \ + : Libp2pMetricsInstanceList{ \ + (const type *)((uintptr_t) * list.it + (this - &list))} {} \ + ~Libp2pMetricsInstanceList() { \ + auto &state{State::get()}; \ + std::lock_guard lock{state.mutex}; \ + state.list.erase(it); \ + } \ + void operator=(const Libp2pMetricsInstanceList &hook) {} \ + } libp2p_metrics_instance_list { \ + this \ } #define LIBP2P_METRICS_INSTANCE_LIST(type) \ diff --git a/include/libp2p/event/emitter.hpp b/include/libp2p/event/emitter.hpp index b58673386..3e316eace 100644 --- a/include/libp2p/event/emitter.hpp +++ b/include/libp2p/event/emitter.hpp @@ -48,8 +48,8 @@ namespace libp2p::event { template std::enable_if_t< std::is_same_v, std::decay_t>, - Signal> - &getSignal() { + Signal> & + getSignal() { return signal_; } @@ -61,8 +61,8 @@ namespace libp2p::event { template std::enable_if_t< !std::is_same_v, std::decay_t>, - Signal> - &getSignal() { + Signal> & + getSignal() { return Base::template getSignal(); } diff --git a/include/libp2p/multi/multiaddress_protocol_list.hpp b/include/libp2p/multi/multiaddress_protocol_list.hpp index 23d631aeb..8905054ef 100644 --- a/include/libp2p/multi/multiaddress_protocol_list.hpp +++ b/include/libp2p/multi/multiaddress_protocol_list.hpp @@ -6,11 +6,11 @@ #pragma once +#include #include #include #include #include -#include namespace libp2p::multi { @@ -58,8 +58,8 @@ namespace libp2p::multi { // https://github.com/multiformats/rust-multiaddr/blob/3c7e813c3b1fdd4187a9ca9ff67e10af0e79231d/src/protocol.rs#L50-L53 X_PARITY_WS = 4770, X_PARITY_WSS = 4780, - // Range for private use: 0x300000 – 0x3FFFFF - // Debug section + // Range for private use: 0x300000 – 0x3FFFFF + // Debug section _DUMMY_PROTO_1 = 0x3DEAD1, _DUMMY_PROTO_2 = 0x3DEAD2, _DUMMY_PROTO_3 = 0x3DEAD3, @@ -161,7 +161,7 @@ namespace libp2p::multi { {Protocol::Code::P2P_CIRCUIT, 0, "p2p-circuit"}, {Protocol::Code::X_PARITY_WS, Protocol::kVarLen, "x-parity-ws"}, {Protocol::Code::X_PARITY_WSS, Protocol::kVarLen, "x-parity-wss"}, -// Debug section + // Debug section {Protocol::Code::_DUMMY_PROTO_1, 0, "_dummy_proto_1"}, {Protocol::Code::_DUMMY_PROTO_2, 0, "_dummy_proto_2"}, {Protocol::Code::_DUMMY_PROTO_3, Protocol::kVarLen, "_dummy_proto_3"}, diff --git a/include/libp2p/peer/peer_id.hpp b/include/libp2p/peer/peer_id.hpp index 8c0b50d20..edc2be714 100644 --- a/include/libp2p/peer/peer_id.hpp +++ b/include/libp2p/peer/peer_id.hpp @@ -135,8 +135,8 @@ struct fmt::formatter { // Formats the PeerId using the parsed format specification (presentation) // stored in this formatter. template - auto format(const libp2p::peer::PeerId &peer_id, FormatContext &ctx) const - -> decltype(ctx.out()) { + auto format(const libp2p::peer::PeerId &peer_id, + FormatContext &ctx) const -> decltype(ctx.out()) { // ctx.out() is an output iterator to write to. auto &&b58 = peer_id.toBase58(); diff --git a/include/libp2p/protocol/kademlia/impl/kademlia_impl.hpp b/include/libp2p/protocol/kademlia/impl/kademlia_impl.hpp index 6bfd0f18a..1ef9091f6 100644 --- a/include/libp2p/protocol/kademlia/impl/kademlia_impl.hpp +++ b/include/libp2p/protocol/kademlia/impl/kademlia_impl.hpp @@ -160,8 +160,10 @@ namespace libp2p::protocol::kademlia { void performRepublishing(); // Helper methods for periodic operations - std::vector getClosestPeers(const Key& key, size_t count); - void replicateRecord(const Key& key, const Value& value, bool extend_expiration); + std::vector getClosestPeers(const Key &key, size_t count); + void replicateRecord(const Key &key, + const Value &value, + bool extend_expiration); log::SubLogger log_; }; diff --git a/src/basic/protobuf_message_read_writer.cpp b/src/basic/protobuf_message_read_writer.cpp index f45551603..906ee6062 100644 --- a/src/basic/protobuf_message_read_writer.cpp +++ b/src/basic/protobuf_message_read_writer.cpp @@ -20,7 +20,7 @@ namespace libp2p::basic { std::shared_ptr conn) // NOLINT(performance-unnecessary-value-param) : read_writer_{ - std::make_shared(std::move(conn))} { + std::make_shared(std::move(conn))} { BOOST_ASSERT(read_writer_); } } // namespace libp2p::basic diff --git a/src/multi/multibase_codec/codecs/base64.cpp b/src/multi/multibase_codec/codecs/base64.cpp index 1a3541845..93fcbe2a1 100644 --- a/src/multi/multibase_codec/codecs/base64.cpp +++ b/src/multi/multibase_codec/codecs/base64.cpp @@ -67,7 +67,7 @@ namespace { }; /// Returns max bytes needed to decode a base64 string - inline std::size_t constexpr decodedSize(std::size_t n) { + inline constexpr std::size_t decodedSize(std::size_t n) { return n / 4 * 3; // requires n&3==0, smaller } diff --git a/src/protocol/kademlia/impl/kademlia_impl.cpp b/src/protocol/kademlia/impl/kademlia_impl.cpp index 0e42de3e7..43ccab7ff 100644 --- a/src/protocol/kademlia/impl/kademlia_impl.cpp +++ b/src/protocol/kademlia/impl/kademlia_impl.cpp @@ -698,7 +698,7 @@ namespace libp2p::protocol::kademlia { log_.debug("Performing periodic replication"); auto records = storage_->getAllRecords(); - for (const auto& [key, value]: records) { + for (const auto &[key, value] : records) { replicateRecord(key, value, false); // false = don't extend expiration } } @@ -707,43 +707,49 @@ namespace libp2p::protocol::kademlia { log_.debug("Performing periodic republishing"); auto records = storage_->getAllRecords(); - for (const auto& [key, value] : records) { + for (const auto &[key, value] : records) { replicateRecord(key, value, true); // true = extend expiration } } - std::vector KademliaImpl::getClosestPeers(const Key& key, size_t count) { + std::vector KademliaImpl::getClosestPeers(const Key &key, + size_t count) { std::vector closest_peers; - + // Get peers from peer routing table HashedKey hashed_key(key); auto peers = peer_routing_table_->getNearestPeers(hashed_key.hash, count); - - for (const auto& peer : peers) { - if (peer != self_id_) { // Don't include self + + for (const auto &peer : peers) { + if (peer != self_id_) { // Don't include self closest_peers.push_back(peer); } } - + return closest_peers; } - void KademliaImpl::replicateRecord(const Key& key, const Value& value, bool extend_expiration) { - // If republishing, extend local expiration by putting the value back to storage + void KademliaImpl::replicateRecord(const Key &key, + const Value &value, + bool extend_expiration) { + // If republishing, extend local expiration by putting the value back to + // storage if (extend_expiration) { auto put_res = storage_->putValue(key, value); if (!put_res) { log_.warn("Republish: failed to extend expiration for key: {}: {}", - multi::detail::encodeBase58(key), put_res.error()); + multi::detail::encodeBase58(key), + put_res.error()); } } - auto closest_peers = getClosestPeers(key, - extend_expiration ? config_.periodicRepublishing.peers_per_cycle + auto closest_peers = getClosestPeers( + key, + extend_expiration ? config_.periodicRepublishing.peers_per_cycle : config_.periodicReplication.peers_per_cycle); - + if (closest_peers.empty()) { - log_.debug("No peers available for replication/republishing of key: {}", + log_.debug("No peers available for replication/republishing of key: {}", multi::detail::encodeBase58(key)); return; } @@ -752,9 +758,9 @@ namespace libp2p::protocol::kademlia { auto executor = createPutValueExecutor(key, value, closest_peers); if (executor) { std::ignore = executor->start(); - log_.debug("Started {} for key: {} to {} peers", + log_.debug("Started {} for key: {} to {} peers", extend_expiration ? "republishing" : "replication", - multi::detail::encodeBase58(key), + multi::detail::encodeBase58(key), closest_peers.size()); } } diff --git a/src/protocol/kademlia/impl/storage_impl.cpp b/src/protocol/kademlia/impl/storage_impl.cpp index 40183eae3..5538ae657 100644 --- a/src/protocol/kademlia/impl/storage_impl.cpp +++ b/src/protocol/kademlia/impl/storage_impl.cpp @@ -121,9 +121,9 @@ namespace libp2p::protocol::kademlia { std::vector> StorageImpl::getAllRecords() const { std::vector> records; auto now = scheduler_->now(); - + // Iterate through all records and get their values from backend - for (const auto& record : *table_) { + for (const auto &record : *table_) { // Only include non-expired records if (record.expire_time > now) { auto value_result = backend_->getValue(record.key); @@ -132,7 +132,7 @@ namespace libp2p::protocol::kademlia { } } } - + return records; } } // namespace libp2p::protocol::kademlia diff --git a/src/security/secio/secio_dialer.cpp b/src/security/secio/secio_dialer.cpp index 681bdafb5..21ce0796b 100644 --- a/src/security/secio/secio_dialer.cpp +++ b/src/security/secio/secio_dialer.cpp @@ -85,8 +85,8 @@ namespace { namespace libp2p::security::secio { Dialer::Dialer(std::shared_ptr connection) : rw{std::make_shared( - std::make_shared( - std::move(connection)))} {} + std::make_shared( + std::move(connection)))} {} void Dialer::storeLocalPeerProposalBytes( const std::shared_ptr> &bytes) { diff --git a/src/security/tls/tls_adaptor.cpp b/src/security/tls/tls_adaptor.cpp index 3aa819715..c5b912c38 100644 --- a/src/security/tls/tls_adaptor.cpp +++ b/src/security/tls/tls_adaptor.cpp @@ -8,9 +8,9 @@ #include #include +#include #include #include -#include namespace libp2p::security { diff --git a/test/acceptance/p2p/host/peer/tick_counter.hpp b/test/acceptance/p2p/host/peer/tick_counter.hpp index f6cafa4a1..31ab2ecdc 100644 --- a/test/acceptance/p2p/host/peer/tick_counter.hpp +++ b/test/acceptance/p2p/host/peer/tick_counter.hpp @@ -29,8 +29,7 @@ struct TickCounter { auto actual_count = ticks_count.load(); ASSERT_EQ(actual_count, required_count) // NOLINT << "sending messages from <" << ci << "> client to <" << si - << "> server " - << "required messages count <" << required_count + << "> server " << "required messages count <" << required_count << ">count doesn't match actual count <" << actual_count << ">"; } diff --git a/test/libp2p/multi/utils/protocol_list_test.cpp b/test/libp2p/multi/utils/protocol_list_test.cpp index 216d9dbb9..dfccbdf99 100644 --- a/test/libp2p/multi/utils/protocol_list_test.cpp +++ b/test/libp2p/multi/utils/protocol_list_test.cpp @@ -46,8 +46,7 @@ TEST(ProtocolList, getByCode) { TEST(ProtocolList, getProtocols) { auto &protocols = ProtocolList::getProtocols(); static_assert(protocols.size() == ProtocolList::kProtocolsNum); - auto it = std::ranges::find_if(protocols, [](auto &p) { - return p.name == "ip4"; - }); + auto it = + std::ranges::find_if(protocols, [](auto &p) { return p.name == "ip4"; }); ASSERT_NE(it, protocols.end()); } diff --git a/test/libp2p/peer/address_repository/inmem_address_repository_test.cpp b/test/libp2p/peer/address_repository/inmem_address_repository_test.cpp index 0faa9cc75..a63cf87a9 100644 --- a/test/libp2p/peer/address_repository/inmem_address_repository_test.cpp +++ b/test/libp2p/peer/address_repository/inmem_address_repository_test.cpp @@ -59,9 +59,12 @@ struct InmemAddressRepository_Test : public ::testing::Test { TEST_F(InmemAddressRepository_Test, GarbageCollection) { // @given address repository that has 2 peers, and some addresses - ASSERT_OUTCOME_SUCCESS(db->addAddresses(p1, std::vector{ma1, ma2}, 10ms)); - ASSERT_OUTCOME_SUCCESS(db->addAddresses(p1, std::vector{ma3, ma4}, 1000ms)); - ASSERT_OUTCOME_SUCCESS(db->upsertAddresses(p2, std::vector{ma4}, 10ms)); + ASSERT_OUTCOME_SUCCESS( + db->addAddresses(p1, std::vector{ma1, ma2}, 10ms)); + ASSERT_OUTCOME_SUCCESS( + db->addAddresses(p1, std::vector{ma3, ma4}, 1000ms)); + ASSERT_OUTCOME_SUCCESS( + db->upsertAddresses(p2, std::vector{ma4}, 10ms)); // @when no collectGarbage is called { @@ -135,8 +138,10 @@ TEST_F(InmemAddressRepository_Test, GarbageCollection) { * @then ttl is updated, ma1 is not evicted */ TEST_F(InmemAddressRepository_Test, UpdateAddress) { - ASSERT_OUTCOME_SUCCESS(db->addAddresses(p1, std::vector{ma1}, 10ms)); - ASSERT_OUTCOME_SUCCESS(db->upsertAddresses(p1, std::vector{ma1}, 1000ms)); + ASSERT_OUTCOME_SUCCESS( + db->addAddresses(p1, std::vector{ma1}, 10ms)); + ASSERT_OUTCOME_SUCCESS( + db->upsertAddresses(p1, std::vector{ma1}, 1000ms)); { ASSERT_OUTCOME_SUCCESS(v, db->getAddresses(p1)); @@ -157,8 +162,10 @@ TEST_F(InmemAddressRepository_Test, UpdateAddress) { * @then ttl of ma1 is not updated, ma1 is evicted. ma2 is inserted. */ TEST_F(InmemAddressRepository_Test, InsertAddress) { - ASSERT_OUTCOME_SUCCESS(db->addAddresses(p1, std::vector{ma1}, 10ms)); - ASSERT_OUTCOME_SUCCESS(db->upsertAddresses(p1, std::vector{ma2}, 1000ms)); + ASSERT_OUTCOME_SUCCESS( + db->addAddresses(p1, std::vector{ma1}, 10ms)); + ASSERT_OUTCOME_SUCCESS( + db->upsertAddresses(p1, std::vector{ma2}, 1000ms)); { ASSERT_OUTCOME_SUCCESS(v, db->getAddresses(p1)); diff --git a/test/libp2p/peer/peer_id_test.cpp b/test/libp2p/peer/peer_id_test.cpp index 6163992ec..66092bc3c 100644 --- a/test/libp2p/peer/peer_id_test.cpp +++ b/test/libp2p/peer/peer_id_test.cpp @@ -33,10 +33,12 @@ TEST_F(PeerIdTest, FromPubkeySuccess) { pubkey.data = kBuffer; auto hash = libp2p::crypto::sha256(pubkey.data).value(); - ASSERT_OUTCOME_SUCCESS(multihash, Multihash::create( - libp2p::multi::sha256, Buffer{hash.begin(), hash.end()})); + ASSERT_OUTCOME_SUCCESS(multihash, + Multihash::create(libp2p::multi::sha256, + Buffer{hash.begin(), hash.end()})); - ASSERT_OUTCOME_SUCCESS(peer_id, PeerId::fromPublicKey(ProtobufKey{pubkey.data})); + ASSERT_OUTCOME_SUCCESS(peer_id, + PeerId::fromPublicKey(ProtobufKey{pubkey.data})); EXPECT_EQ(peer_id.toBase58(), encodeBase58(multihash.toBuffer())); EXPECT_EQ(peer_id.toMultihash(), multihash); } @@ -47,7 +49,8 @@ TEST_F(PeerIdTest, FromPubkeySuccess) { * @then creation is successful */ TEST_F(PeerIdTest, FromBase58Success) { - ASSERT_OUTCOME_SUCCESS(hash, Multihash::create(libp2p::multi::sha256, kBuffer)); + ASSERT_OUTCOME_SUCCESS(hash, + Multihash::create(libp2p::multi::sha256, kBuffer)); auto hash_b58 = encodeBase58(hash.toBuffer()); ASSERT_OUTCOME_SUCCESS(peer_id, PeerId::fromBase58(hash_b58)); @@ -81,7 +84,8 @@ TEST_F(PeerIdTest, FromBase58IcorrectHash) { * @then creation fails */ TEST_F(PeerIdTest, FromBase58NotSha256) { - ASSERT_OUTCOME_SUCCESS(hash, Multihash::create(libp2p::multi::sha512, kBuffer)); + ASSERT_OUTCOME_SUCCESS(hash, + Multihash::create(libp2p::multi::sha512, kBuffer)); auto hash_b58 = encodeBase58(hash.toBuffer()); EXPECT_FALSE(PeerId::fromBase58(hash_b58)); @@ -93,7 +97,8 @@ TEST_F(PeerIdTest, FromBase58NotSha256) { * @then creation is successful */ TEST_F(PeerIdTest, FromHashSuccess) { - ASSERT_OUTCOME_SUCCESS(hash, Multihash::create(libp2p::multi::sha256, kBuffer)); + ASSERT_OUTCOME_SUCCESS(hash, + Multihash::create(libp2p::multi::sha256, kBuffer)); auto hash_b58 = encodeBase58(hash.toBuffer()); ASSERT_OUTCOME_SUCCESS(peer_id, PeerId::fromHash(hash)); @@ -107,7 +112,8 @@ TEST_F(PeerIdTest, FromHashSuccess) { * @then creation fails */ TEST_F(PeerIdTest, FromHashNotSha256) { - ASSERT_OUTCOME_SUCCESS(hash, Multihash::create(libp2p::multi::sha512, kBuffer)); + ASSERT_OUTCOME_SUCCESS(hash, + Multihash::create(libp2p::multi::sha512, kBuffer)); EXPECT_FALSE(PeerId::fromHash(hash)); } diff --git a/test/libp2p/transport/tcp/tcp_listener_test.cpp b/test/libp2p/transport/tcp/tcp_listener_test.cpp index c96a9b585..3d08a2138 100644 --- a/test/libp2p/transport/tcp/tcp_listener_test.cpp +++ b/test/libp2p/transport/tcp/tcp_listener_test.cpp @@ -83,7 +83,8 @@ TEST_F(TcpListenerTest, DoubleClose) { EXPECT_CALL(cb, Call(_)).WillOnce(Invoke([](CapConnResult c) { if (!c) { if (!c) { - ASSERT_EQ(c.error().value(), (int)boost::asio::error::operation_aborted); + ASSERT_EQ(c.error().value(), + (int)boost::asio::error::operation_aborted); } else { ADD_FAILURE(); } diff --git a/test/libp2p/transport/upgrader_test.cpp b/test/libp2p/transport/upgrader_test.cpp index 9dda85d92..f534cb6de 100644 --- a/test/libp2p/transport/upgrader_test.cpp +++ b/test/libp2p/transport/upgrader_test.cpp @@ -122,9 +122,11 @@ class UpgraderTest : public testing::Test { TEST_F(UpgraderTest, UpgradeLayersInitiator) { setAllOutbound(); - ASSERT_OUTCOME_SUCCESS(address, libp2p::multi::Multiaddress::create( - "/ip4/127.0.0.1/tcp/1234/_dummy_proto_1/_dummy_proto_2" - "/p2p/12D3KooWEgUjBV5FJAuBSoNMRYFRHjV7PjZwRQ7b43EKX9g7D6xV")); + ASSERT_OUTCOME_SUCCESS( + address, + libp2p::multi::Multiaddress::create( + "/ip4/127.0.0.1/tcp/1234/_dummy_proto_1/_dummy_proto_2" + "/p2p/12D3KooWEgUjBV5FJAuBSoNMRYFRHjV7PjZwRQ7b43EKX9g7D6xV")); auto layers = detail::asTcp(address).value().second; EXPECT_CALL(*std::static_pointer_cast(layer_adaptors_[0]), @@ -148,9 +150,11 @@ TEST_F(UpgraderTest, UpgradeLayersInitiator) { TEST_F(UpgraderTest, UpgradeLayersNotInitiator) { setAllInbound(); - ASSERT_OUTCOME_SUCCESS(address, libp2p::multi::Multiaddress::create( - "/ip4/127.0.0.1/tcp/1234/_dummy_proto_1/_dummy_proto_2" - "/p2p/12D3KooWEgUjBV5FJAuBSoNMRYFRHjV7PjZwRQ7b43EKX9g7D6xV")); + ASSERT_OUTCOME_SUCCESS( + address, + libp2p::multi::Multiaddress::create( + "/ip4/127.0.0.1/tcp/1234/_dummy_proto_1/_dummy_proto_2" + "/p2p/12D3KooWEgUjBV5FJAuBSoNMRYFRHjV7PjZwRQ7b43EKX9g7D6xV")); auto layers = detail::asTcp(address).value().second; EXPECT_CALL(