erigontech · canepat · Jan 11, 2024 · Jan 9, 2024 · Jan 9, 2024 · Jan 9, 2024
diff --git a/.clang-tidy b/.clang-tidy
@@ -64,6 +64,7 @@ Checks: >
   -misc-no-recursion,
   -misc-non-private-member-variables-in-classes,
   -misc-redundant-expression,
+  -misc-unused-using-decls,
   -misc-use-anonymous-namespace,
   modernize-*,
   -modernize-avoid-c-arrays,

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -91,7 +91,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler_warnings.cmake)
 if(SILKWORM_CLANG_TIDY)
   find_program(CLANG_TIDY clang-tidy REQUIRED)
   set(CMAKE_C_CLANG_TIDY "${CLANG_TIDY};-warnings-as-errors=*")
-  set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY}")
+  set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY};-warnings-as-errors=*")
 endif()
 
 # Silkworm itself

diff --git a/cmd/common/db_checklist.cpp b/cmd/common/db_checklist.cpp
@@ -125,21 +125,17 @@ void run_db_checklist(NodeSettings& node_settings, bool init_if_empty) {
                         const auto known_value_activation{known_value.get<uint64_t>()};
                         const auto active_value_activation{active_value.get<uint64_t>()};
                         if (known_value_activation != active_value_activation) {
-                            bool must_throw{false};
-                            if (!known_value_activation && active_value_activation &&
-                                active_value_activation <= header_download_progress) {
+                            const bool must_throw{
                                 // Can't de-activate an already activated fork block
-                                must_throw = true;
-                            } else if (!active_value_activation && known_value_activation &&
-                                       known_value_activation <= header_download_progress) {
+                                (!known_value_activation && active_value_activation &&
+                                 active_value_activation <= header_download_progress) ||
                                 // Can't activate a fork block BEFORE current height
-                                must_throw = true;
-                            } else if (known_value_activation && active_value_activation &&
-                                       std::min(known_value_activation, active_value_activation) <=
-                                           header_download_progress) {
+                                (!active_value_activation && known_value_activation &&
+                                 known_value_activation <= header_download_progress) ||
                                 // Can change activation height BEFORE current height
-                                must_throw = true;
-                            }
+                                (known_value_activation && active_value_activation &&
+                                 std::min(known_value_activation, active_value_activation) <=
+                                     header_download_progress)};
                             if (must_throw) {
                                 throw std::runtime_error("Can't apply modified chain config key " +
                                                          known_key + " from " +

diff --git a/cmd/silkworm.cpp b/cmd/silkworm.cpp
@@ -290,6 +290,7 @@ int main(int argc, char* argv[]) {
         };
 
         // Execution: the execution layer engine
+        // NOLINTNEXTLINE(cppcoreguidelines-slicing)
         silkworm::node::Node execution_node{settings.node_settings, sentry_client, chaindata_db};
         execution::LocalClient& execution_client{execution_node.execution_local_client()};
 
@@ -306,7 +307,7 @@ int main(int argc, char* argv[]) {
         };
         chainsync::Sync chain_sync_process{
             context_pool.any_executor(),
-            chaindata_db,
+            chaindata_db,  // NOLINT(cppcoreguidelines-slicing)
             execution_client,
             sentry_client,
             *node_settings.chain_config,

diff --git a/silkworm/capi/sentry.cpp b/silkworm/capi/sentry.cpp
@@ -122,7 +122,10 @@ SILKWORM_EXPORT int silkworm_sentry_start(SilkwormHandle handle, const struct Si
         std::latch sentry_started{1};
         std::exception_ptr startup_ex_ptr;
 
-        handle->sentry_thread = std::make_unique<std::thread>([settings = std::move(settings), &sentry_stop_signal = handle->sentry_stop_signal, &sentry_started, &startup_ex_ptr] {
+        handle->sentry_thread = std::make_unique<std::thread>([settings = std::move(settings),
+                                                               &sentry_stop_signal = handle->sentry_stop_signal,
+                                                               &sentry_started,
+                                                               &startup_ex_ptr]() mutable {
             try {
                 log::set_thread_name("sentry-run");
                 sentry_run(std::move(settings), sentry_stop_signal.slot(), sentry_started);

diff --git a/silkworm/capi/silkworm.cpp b/silkworm/capi/silkworm.cpp
@@ -153,6 +153,7 @@ SILKWORM_EXPORT int silkworm_init(
     auto snapshot_repository = std::make_unique<snapshot::SnapshotRepository>();
     db::DataModel::set_snapshot_repository(snapshot_repository.get());
 
+    // NOLINTNEXTLINE(bugprone-unhandled-exception-at-new)
     *handle = new SilkwormInstance{
         {},  // context_pool_settings
         make_path(settings->data_dir_path),

diff --git a/silkworm/core/CMakeLists.txt b/silkworm/core/CMakeLists.txt
@@ -24,10 +24,6 @@ else()
   add_compile_options(-fno-exceptions)
 endif()
 
-if(SILKWORM_CLANG_TIDY)
-  set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY};-warnings-as-errors=*")
-endif()
-
 file(
   GLOB_RECURSE
   SILKWORM_CORE_SRC

diff --git a/silkworm/infra/CMakeLists.txt b/silkworm/infra/CMakeLists.txt
@@ -22,10 +22,6 @@ find_package(gRPC REQUIRED)
 find_package(GTest REQUIRED)
 find_package(magic_enum REQUIRED)
 
-if(SILKWORM_CLANG_TIDY)
-  set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY};-warnings-as-errors=*")
-endif()
-
 add_subdirectory(test_util)
 
 set(TARGET silkworm_infra)

diff --git a/silkworm/node/CMakeLists.txt b/silkworm/node/CMakeLists.txt
@@ -23,10 +23,6 @@ find_package(magic_enum REQUIRED)
 find_package(Protobuf REQUIRED)
 find_package(roaring REQUIRED)
 
-if(SILKWORM_CLANG_TIDY)
-  set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY};-warnings-as-errors=*")
-endif()
-
 file(
   GLOB_RECURSE
   SILKWORM_NODE_SRC

diff --git a/silkworm/rpc/CMakeLists.txt b/silkworm/rpc/CMakeLists.txt
@@ -22,10 +22,6 @@ find_package(jwt-cpp REQUIRED)
 find_package(nlohmann_json REQUIRED)
 find_package(roaring REQUIRED)
 
-if(SILKWORM_CLANG_TIDY)
-  set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY};-warnings-as-errors=*")
-endif()
-
 # Silkrpc library
 file(
   GLOB_RECURSE

diff --git a/silkworm/rpc/commands/engine_api_test.cpp b/silkworm/rpc/commands/engine_api_test.cpp
@@ -41,8 +41,6 @@
 
 namespace silkworm::rpc::commands {
 
-using evmc::literals::operator""_bytes32;
-
 namespace {
     //! This dummy transaction just gives you the same cursor over and over again.
     class DummyTransaction : public ethdb::Transaction {

diff --git a/silkworm/rpc/common/util_test.cpp b/silkworm/rpc/common/util_test.cpp
@@ -33,8 +33,6 @@ TEST_CASE("print Bytes", "[rpc][common][util]") {
     CHECK_NOTHROW(test_util::null_stream() << b);
 }
 
-using evmc::literals::operator""_address, evmc::literals::operator""_bytes32;
-
 TEST_CASE("byte view from string", "[rpc][common][util]") {
     CHECK(silkworm::byte_view_of_string("").empty());
 }

diff --git a/silkworm/rpc/core/account_walker_test.cpp b/silkworm/rpc/core/account_walker_test.cpp
@@ -33,8 +33,6 @@
 
 namespace silkworm::rpc {
 
-using evmc::literals::operator""_address;
-
 static const nlohmann::json empty;
 static const std::string zeros = "00000000000000000000000000000000000000000000000000000000000000000000000000000000";  // NOLINT
 

diff --git a/silkworm/rpc/core/estimate_gas_oracle_test.cpp b/silkworm/rpc/core/estimate_gas_oracle_test.cpp
@@ -46,7 +46,6 @@ struct RemoteDatabaseTest : test::KVTestBase {
 };
 
 using testing::_;
-using testing::InvokeWithoutArgs;
 using testing::Return;
 
 TEST_CASE("EstimateGasException") {

diff --git a/silkworm/rpc/core/evm_debug_test.cpp b/silkworm/rpc/core/evm_debug_test.cpp
@@ -36,8 +36,6 @@
 
 namespace silkworm::rpc::debug {
 
-using evmc::literals::operator""_address;
-
 using testing::InvokeWithoutArgs;
 
 static Bytes kZeroKey{*silkworm::from_hex("0000000000000000")};

diff --git a/silkworm/rpc/core/evm_executor_test.cpp b/silkworm/rpc/core/evm_executor_test.cpp
@@ -38,8 +38,6 @@
 
 namespace silkworm::rpc {
 
-using evmc::literals::operator""_address, evmc::literals::operator""_bytes32;
-
 #ifndef SILKWORM_SANITIZE
 TEST_CASE("EVMExecutor") {
     silkworm::test_util::SetLogVerbosityGuard log_guard{log::Level::kNone};

diff --git a/silkworm/rpc/core/evm_trace_test.cpp b/silkworm/rpc/core/evm_trace_test.cpp
@@ -40,9 +40,6 @@
 
 namespace silkworm::rpc::trace {
 
-using evmc::literals::operator""_address;
-using evmc::literals::operator""_bytes32;
-
 using testing::InvokeWithoutArgs;
 
 static Bytes kZeroKey{*silkworm::from_hex("0000000000000000")};

diff --git a/silkworm/rpc/core/gas_price_oracle_test.cpp b/silkworm/rpc/core/gas_price_oracle_test.cpp
@@ -29,8 +29,6 @@
 
 namespace silkworm {
 
-using evmc::literals::operator""_address;
-
 static const evmc::address kBeneficiary = 0xe5ef458d37212a06e3f59d40c454e76150ae7c31_address;
 static const evmc::address kFromTnx1 = 0xe5ef458d37212a06e3f59d40c454e76150ae7c32_address;
 static const evmc::address kFromTnx2 = 0xe5ef458d37212a06e3f59d40c454e76150ae7c33_address;

diff --git a/silkworm/rpc/core/rawdb/chain_test.cpp b/silkworm/rpc/core/rawdb/chain_test.cpp
@@ -40,7 +40,6 @@ using testing::_;
 using testing::Invoke;
 using testing::InvokeWithoutArgs;
 using testing::Unused;
-using evmc::literals::operator""_bytes32;
 
 static silkworm::Bytes kNumber{*silkworm::from_hex("00000000003D0900")};
 static silkworm::Bytes kTotalBurnt{*silkworm::from_hex("0000000000000005")};

diff --git a/silkworm/rpc/core/state_reader_test.cpp b/silkworm/rpc/core/state_reader_test.cpp
@@ -29,7 +29,6 @@
 
 namespace silkworm::rpc {
 
-using evmc::literals::operator""_bytes32;
 using testing::_;
 using testing::InvokeWithoutArgs;
 

diff --git a/silkworm/rpc/core/storage_walker_test.cpp b/silkworm/rpc/core/storage_walker_test.cpp
@@ -33,9 +33,6 @@
 
 namespace silkworm::rpc {
 
-using evmc::literals::operator""_address;
-using evmc::literals::operator""_bytes32;
-
 const nlohmann::json empty;
 const std::string zeros = "00000000000000000000000000000000000000000000000000000000000000000000000000000000";  // NOLINT
 

diff --git a/silkworm/rpc/txpool/miner_test.cpp b/silkworm/rpc/txpool/miner_test.cpp
@@ -35,9 +35,6 @@
 
 namespace silkworm::rpc::txpool {
 
-using Catch::Matchers::Message;
-using testing::_;
-
 using evmc::literals::operator""_bytes32;
 using StrictMockMiningStub = testing::StrictMock<::txpool::MockMiningStub>;
 

diff --git a/silkworm/rpc/txpool/transaction_pool_test.cpp b/silkworm/rpc/txpool/transaction_pool_test.cpp
@@ -69,8 +69,6 @@ inline bool operator==(const AddReply& lhs, const AddReply& rhs) {
 
 namespace silkworm::rpc::txpool {
 
-using testing::_;
-
 using evmc::literals::operator""_address, evmc::literals::operator""_bytes32;
 using StrictMockTxpoolStub = testing::StrictMock<::txpool::MockTxpoolStub>;
 

diff --git a/silkworm/sentry/CMakeLists.txt b/silkworm/sentry/CMakeLists.txt
@@ -23,10 +23,6 @@ find_package(Microsoft.GSL REQUIRED)
 find_package(OpenSSL REQUIRED)
 find_package(Snappy REQUIRED)
 
-if(SILKWORM_CLANG_TIDY)
-  set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY};-warnings-as-errors=*")
-endif()
-
 # sentry common
 add_subdirectory(common)
 

diff --git a/silkworm/sync/CMakeLists.txt b/silkworm/sync/CMakeLists.txt
@@ -17,10 +17,6 @@
 find_package(absl REQUIRED)
 find_package(magic_enum REQUIRED)
 
-if(SILKWORM_CLANG_TIDY)
-  set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY};-warnings-as-errors=*")
-endif()
-
 file(GLOB_RECURSE SILKWORM_SYNC_SRC CONFIGURE_DEPENDS "*.cpp" "*.hpp")
 list(FILTER SILKWORM_SYNC_SRC EXCLUDE REGEX "_test\\.cpp$")