Skip to content

Commit de343e7

Browse files
battlmonstrbattlmonstr
authored
tidy: disable cppcoreguidelines-avoid-capturing-lambda-coroutines (#2133)
1 parent f135a34 commit de343e7

File tree

9 files changed

+21
-35
lines changed

9 files changed

+21
-35
lines changed

‎.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Checks: >
1818
concurrency-*,
1919
cppcoreguidelines-*,
2020
-cppcoreguidelines-avoid-c-arrays,
21+
-cppcoreguidelines-avoid-capturing-lambda-coroutines,
2122
-cppcoreguidelines-avoid-const-or-ref-data-members,
2223
-cppcoreguidelines-avoid-do-while,
2324
-cppcoreguidelines-avoid-magic-numbers,

‎silkworm/db/remote/kv/grpc/server/kv_calls.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ Task<void> TxCall::operator()(mdbx::env* chaindata_env) {
110110
remote::Cursor request;
111111
read_stream.initiate(agrpc::read, responder_, request);
112112

113-
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
114113
const auto read = [&]() -> Task<void> {
115114
try {
116115
while (co_await read_stream.next()) {
@@ -139,12 +138,10 @@ Task<void> TxCall::operator()(mdbx::env* chaindata_env) {
139138
status = ::grpc::Status{::grpc::StatusCode::INTERNAL, exc.what()};
140139
}
141140
};
142-
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
143141
const auto write = [&]() -> Task<void> {
144142
while (co_await write_stream.next()) {
145143
}
146144
};
147-
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
148145
const auto max_idle_timer = [&]() -> Task<void> {
149146
while (true) {
150147
const auto [ec] = co_await max_idle_alarm.async_wait(as_tuple(use_awaitable));
@@ -156,7 +153,6 @@ Task<void> TxCall::operator()(mdbx::env* chaindata_env) {
156153
}
157154
}
158155
};
159-
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
160156
const auto max_ttl_timer = [&]() -> Task<void> {
161157
while (true) {
162158
const auto [ec] = co_await max_ttl_alarm.async_wait(as_tuple(use_awaitable));

‎silkworm/db/remote/kv/grpc/server/kv_server.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,39 +47,39 @@ void KvServer::register_kv_request_calls(agrpc::GrpcContext* grpc_context) {
4747

4848
// Register one requested call repeatedly for each RPC: asio-grpc will take care of re-registration on any incoming call
4949
request_repeatedly(*grpc_context, service, &remote::KV::AsyncService::RequestVersion,
50-
[](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
50+
[](auto&&... args) -> Task<void> {
5151
co_await KvVersionCall{std::forward<decltype(args)>(args)...}();
5252
});
5353
request_repeatedly(*grpc_context, service, &remote::KV::AsyncService::RequestTx,
54-
[this, grpc_context](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
54+
[this, grpc_context](auto&&... args) -> Task<void> {
5555
co_await TxCall{*grpc_context, std::forward<decltype(args)>(args)...}(chaindata_env_);
5656
});
5757
request_repeatedly(*grpc_context, service, &remote::KV::AsyncService::RequestStateChanges,
58-
[this](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
58+
[this](auto&&... args) -> Task<void> {
5959
co_await StateChangesCall{std::forward<decltype(args)>(args)...}(state_change_source_);
6060
});
6161
request_repeatedly(*grpc_context, service, &remote::KV::AsyncService::RequestSnapshots,
62-
[](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
62+
[](auto&&... args) -> Task<void> {
6363
co_await SnapshotsCall{std::forward<decltype(args)>(args)...}();
6464
});
6565
request_repeatedly(*grpc_context, service, &remote::KV::AsyncService::RequestDomainGet,
66-
[](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
66+
[](auto&&... args) -> Task<void> {
6767
co_await DomainGetCall{std::forward<decltype(args)>(args)...}();
6868
});
6969
request_repeatedly(*grpc_context, service, &remote::KV::AsyncService::RequestHistoryGet,
70-
[](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
70+
[](auto&&... args) -> Task<void> {
7171
co_await HistoryGetCall{std::forward<decltype(args)>(args)...}();
7272
});
7373
request_repeatedly(*grpc_context, service, &remote::KV::AsyncService::RequestIndexRange,
74-
[](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
74+
[](auto&&... args) -> Task<void> {
7575
co_await IndexRangeCall{std::forward<decltype(args)>(args)...}();
7676
});
7777
request_repeatedly(*grpc_context, service, &remote::KV::AsyncService::RequestHistoryRange,
78-
[](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
78+
[](auto&&... args) -> Task<void> {
7979
co_await HistoryRangeCall{std::forward<decltype(args)>(args)...}();
8080
});
8181
request_repeatedly(*grpc_context, service, &remote::KV::AsyncService::RequestDomainRange,
82-
[](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
82+
[](auto&&... args) -> Task<void> {
8383
co_await DomainRangeCall{std::forward<decltype(args)>(args)...}();
8484
});
8585
SILK_TRACE << "KvServer::register_kv_request_calls END";

‎silkworm/node/execution/grpc/server/server.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ class ServerImpl final : public rpc::Server {
5050
auto async_service = &async_service_;
5151
auto& service = service_;
5252
// Registering repeatedly in asio-grpc will guarantee the RequestHandler lambda lifetime
53-
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
5453
rpc::request_repeatedly(*grpc_context, async_service, rpc, [&service](auto&&... args) -> Task<void> {
5554
co_await RequestHandler{std::forward<decltype(args)>(args)...}(*service);
5655
});

‎silkworm/node/remote/ethbackend/grpc/server/backend_server.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,35 +51,35 @@ void BackEndServer::register_backend_request_calls(agrpc::GrpcContext* grpc_cont
5151

5252
// Register one requested call repeatedly for each RPC: asio-grpc will take care of re-registration on any incoming call
5353
request_repeatedly(*grpc_context, service, &remote::ETHBACKEND::AsyncService::RequestEtherbase,
54-
[&backend](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
54+
[&backend](auto&&... args) -> Task<void> {
5555
co_await EtherbaseCall{std::forward<decltype(args)>(args)...}(backend);
5656
});
5757
request_repeatedly(*grpc_context, service, &remote::ETHBACKEND::AsyncService::RequestNetVersion,
58-
[&backend](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
58+
[&backend](auto&&... args) -> Task<void> {
5959
co_await NetVersionCall{std::forward<decltype(args)>(args)...}(backend);
6060
});
6161
request_repeatedly(*grpc_context, service, &remote::ETHBACKEND::AsyncService::RequestNetPeerCount,
62-
[&backend](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
62+
[&backend](auto&&... args) -> Task<void> {
6363
co_await NetPeerCountCall{std::forward<decltype(args)>(args)...}(backend);
6464
});
6565
request_repeatedly(*grpc_context, service, &remote::ETHBACKEND::AsyncService::RequestVersion,
66-
[&backend](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
66+
[&backend](auto&&... args) -> Task<void> {
6767
co_await BackEndVersionCall{std::forward<decltype(args)>(args)...}(backend);
6868
});
6969
request_repeatedly(*grpc_context, service, &remote::ETHBACKEND::AsyncService::RequestProtocolVersion,
70-
[&backend](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
70+
[&backend](auto&&... args) -> Task<void> {
7171
co_await ProtocolVersionCall{std::forward<decltype(args)>(args)...}(backend);
7272
});
7373
request_repeatedly(*grpc_context, service, &remote::ETHBACKEND::AsyncService::RequestClientVersion,
74-
[&backend](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
74+
[&backend](auto&&... args) -> Task<void> {
7575
co_await ClientVersionCall{std::forward<decltype(args)>(args)...}(backend);
7676
});
7777
request_repeatedly(*grpc_context, service, &remote::ETHBACKEND::AsyncService::RequestSubscribe,
78-
[&backend](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
78+
[&backend](auto&&... args) -> Task<void> {
7979
co_await SubscribeCall{std::forward<decltype(args)>(args)...}(backend);
8080
});
8181
request_repeatedly(*grpc_context, service, &remote::ETHBACKEND::AsyncService::RequestNodeInfo,
82-
[&backend](auto&&... args) -> Task<void> { // NOLINT(cppcoreguidelines-avoid-capturing-lambda-coroutines)
82+
[&backend](auto&&... args) -> Task<void> {
8383
co_await NodeInfoCall{std::forward<decltype(args)>(args)...}(backend);
8484
});
8585
SILK_TRACE << "BackEndService::register_backend_request_calls END";

‎silkworm/rpc/commands/erigon_api.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ Task<void> ErigonRpcApi::handle_erigon_get_block_by_timestamp(const nlohmann::js
145145
block_number = kEarliestBlockNumber;
146146
} else {
147147
// Good-old binary search to find the lowest block header matching timestamp
148-
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
149148
auto matching_block_number = co_await binary_search(current_block_number, [&](uint64_t bn) -> Task<bool> {
150149
const auto header = co_await chain_storage->read_canonical_header(bn);
151150
co_return header && header->timestamp >= timestamp;

‎silkworm/rpc/core/estimate_gas_oracle_test.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,10 @@ TEST_CASE("estimate gas") {
8686

8787
silkworm::Account kAccount{0, kBalance};
8888

89-
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
9089
BlockHeaderProvider block_header_provider = [&kBlockHeader](BlockNum /*block_number*/) -> Task<std::optional<BlockHeader>> {
9190
co_return kBlockHeader;
9291
};
9392

94-
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
9593
AccountReader account_reader = [&kAccount](const evmc::address& /*address*/, BlockNum /*block_number*/) -> Task<std::optional<silkworm::Account>> {
9694
co_return kAccount;
9795
};

‎silkworm/rpc/core/receipts_test.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ TEST_CASE("read_raw_receipts") {
8585
co_return *silkworm::from_hex("818400f6011a0004a0c8");
8686
}));
8787
auto cursor{std::make_shared<test::MockCursor>()};
88-
EXPECT_CALL(transaction, cursor(db::table::kLogsName)).WillOnce(Invoke(
89-
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
90-
[&cursor](Unused) -> Task<std::shared_ptr<ethdb::Cursor>> { co_return cursor; }));
88+
EXPECT_CALL(transaction, cursor(db::table::kLogsName)).WillOnce(Invoke([&cursor](Unused) -> Task<std::shared_ptr<ethdb::Cursor>> { co_return cursor; }));
9189
EXPECT_CALL(*cursor, seek(_)).WillOnce(Invoke([](Unused) -> Task<KeyValue> {
9290
silkworm::Bytes key{*silkworm::from_hex("000000000035db8000000000")};
9391
silkworm::Bytes value{*silkworm::from_hex(
@@ -127,9 +125,7 @@ TEST_CASE("read_raw_receipts") {
127125
co_return *silkworm::from_hex("828400f6011a0003be508400f6011a0008b89a");
128126
}));
129127
auto cursor{std::make_shared<test::MockCursor>()};
130-
EXPECT_CALL(transaction, cursor(db::table::kLogsName)).WillOnce(Invoke(
131-
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
132-
[&cursor](Unused) -> Task<std::shared_ptr<ethdb::Cursor>> { co_return cursor; }));
128+
EXPECT_CALL(transaction, cursor(db::table::kLogsName)).WillOnce(Invoke([&cursor](Unused) -> Task<std::shared_ptr<ethdb::Cursor>> { co_return cursor; }));
133129
EXPECT_CALL(*cursor, seek(_)).WillOnce(Invoke([](Unused) -> Task<KeyValue> {
134130
silkworm::Bytes key1{*silkworm::from_hex("000000000035db8400000000")};
135131
silkworm::Bytes value1{*silkworm::from_hex(
@@ -186,9 +182,7 @@ TEST_CASE("read_raw_receipts") {
186182
co_return *silkworm::from_hex("818400f6011a0004a0c8");
187183
}));
188184
auto cursor{std::make_shared<test::MockCursor>()};
189-
EXPECT_CALL(transaction, cursor(db::table::kLogsName)).WillOnce(Invoke(
190-
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
191-
[&cursor](Unused) -> Task<std::shared_ptr<ethdb::Cursor>> { co_return cursor; }));
185+
EXPECT_CALL(transaction, cursor(db::table::kLogsName)).WillOnce(Invoke([&cursor](Unused) -> Task<std::shared_ptr<ethdb::Cursor>> { co_return cursor; }));
192186
EXPECT_CALL(*cursor, seek(_)).WillOnce(Invoke([](Unused) -> Task<KeyValue> {
193187
silkworm::Bytes key{};
194188
silkworm::Bytes value{*silkworm::from_hex(

‎silkworm/sync/sync_pos_test.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ TEST_CASE_METHOD(PoSSyncTest, "PoSSync::new_payload timeout") {
138138
EXPECT_CALL(*execution_service, insert_blocks(_))
139139
.WillOnce(InvokeWithoutArgs([]() -> Task<execution::api::InsertionResult> { co_return execution::api::InsertionResult{}; }));
140140
EXPECT_CALL(*execution_service, get_header_hash_number(Hash{payload.block_hash}))
141-
// NOLINTNEXTLINE(cppcoreguidelines-avoid-capturing-lambda-coroutines)
142141
.WillOnce(InvokeWithoutArgs([=]() -> Task<std::optional<BlockNum>> { co_return payload.number; }));
143142
EXPECT_CALL(*execution_service, validate_chain(block_number_or_hash))
144143
.WillOnce(InvokeWithoutArgs([&]() -> Task<execution::api::ValidationResult> {

0 commit comments

Comments
 (0)