node: fix clang-tidy after PR 1763 (#1775)

erigontech · Jan 23, 2024 · 7280671 · 7280671
1 parent f4da896
commit 7280671
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 21 deletions.
diff --git a/silkworm/node/db/access_layer_test.cpp b/silkworm/node/db/access_layer_test.cpp
@@ -20,7 +20,6 @@
 
 #include <catch2/catch.hpp>
 
-#include <silkworm/core/chain/genesis.hpp>
 #include <silkworm/core/common/bytes_to_string.hpp>
 #include <silkworm/core/common/empty_hashes.hpp>
 #include <silkworm/core/common/test_util.hpp>

diff --git a/silkworm/node/db/memory_mutation_cursor.hpp b/silkworm/node/db/memory_mutation_cursor.hpp
@@ -92,7 +92,7 @@ class MemoryMutationCursor : public RWCursorDupSort {
     static inline void throw_error_nodata();
     static inline void throw_error_notfound();
 
-    enum class MoveType {
+    enum class MoveType : uint8_t {
         kNone,
         kNext,
         kNextDup,

diff --git a/silkworm/node/db/prune_mode.cpp b/silkworm/node/db/prune_mode.cpp
@@ -40,7 +40,7 @@ static BlockAmount read_block_amount_for_key(mdbx::cursor& source, const char* k
                 value_type = BlockAmount::Type::kOlder;
                 // For compatibility reasons with Erigon we assume a value == UINT64_MAX means no pruning
                 if (value == UINT64_MAX) {
-                    return BlockAmount();
+                    return {};
                 }
             } else if (data2.value.as_string() == "before") {
                 value_type = BlockAmount::Type::kBefore;
@@ -51,7 +51,7 @@ static BlockAmount read_block_amount_for_key(mdbx::cursor& source, const char* k
         }
         return BlockAmount(value_type, value);
     }
-    return BlockAmount();
+    return {};
 }
 
 //! \brief Writes the BlockAmount keys in db

diff --git a/silkworm/node/db/prune_mode.hpp b/silkworm/node/db/prune_mode.hpp
@@ -40,7 +40,7 @@ using PruneThreshold = std::optional<BlockNum>;  // for 'before' type
 
 class BlockAmount {
   public:
-    enum class Type {
+    enum class Type : uint8_t {
         kOlder,  // Prune Data Older than (moving window)
         kBefore  // Prune data before (fixed)
     };
@@ -70,11 +70,11 @@ class PruneMode {
 
     explicit PruneMode(BlockAmount history, BlockAmount receipts, BlockAmount senders, BlockAmount tx_index,
                        BlockAmount call_traces)
-        : history_{std::move(history)},
-          receipts_{std::move(receipts)},
-          senders_{std::move(senders)},
-          tx_index_{std::move(tx_index)},
-          call_traces_{std::move(call_traces)} {}
+        : history_{history},
+          receipts_{receipts},
+          senders_{senders},
+          tx_index_{tx_index},
+          call_traces_{call_traces} {}
 
     [[nodiscard]] const BlockAmount& history() const { return history_; }
     [[nodiscard]] const BlockAmount& receipts() const { return receipts_; }

diff --git a/silkworm/node/db/receipt_cbor_test.cpp b/silkworm/node/db/receipt_cbor_test.cpp
@@ -20,7 +20,6 @@
 
 #include <silkworm/core/common/test_util.hpp>
 #include <silkworm/core/common/util.hpp>
-#include <silkworm/core/types/transaction.hpp>
 
 namespace silkworm {
 

diff --git a/silkworm/node/db/stages.hpp b/silkworm/node/db/stages.hpp
@@ -73,15 +73,6 @@ inline constexpr const char* kFinishKey{"Finish"};
 //! \brief Not an actual stage rather placeholder for global unwind point
 inline constexpr const char* kUnwindKey{"Unwind"};
 
-//! \brief Create block for mining
-inline constexpr const char* kMiningCreateBlockKey{"MiningCreateBlock"};
-
-//! \brief  Execute mining
-inline constexpr const char* kMiningExecutionKey{"MiningExecution"};
-
-//! \brief Mining completed
-inline constexpr const char* kMiningFinishKey{"MiningFinish"};
-
 //! \brief List of all known stages
 inline constexpr const char* kAllStages[]{
     kHeadersKey,

diff --git a/silkworm/node/db/tables.hpp b/silkworm/node/db/tables.hpp
@@ -60,7 +60,7 @@ inline constexpr db::MapConfig kAccountChangeSet{kAccountChangeSetName, mdbx::ke
 inline constexpr const char* kAccountHistoryName{"AccountHistory"};
 inline constexpr db::MapConfig kAccountHistory{kAccountHistoryName};
 
-//! \details Holds blockbody data
+//! \details Holds block body data
 //! \struct
 //! \verbatim
 //!   key   : block number (BE 8 bytes) + block header hash (32 bytes)