From 54286a25a17551e3316a46aa621512a0667bb60c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Wo=CC=81jcik?= <3044353+pwojcikdev@users.noreply.github.com> Date: Tue, 10 Jun 2025 13:44:36 +0200 Subject: [PATCH] Code style cleanup --- nano/store/db_val.hpp | 30 +++++----- nano/store/db_val_templ.hpp | 112 ++++++++++++++++++------------------ 2 files changed, 70 insertions(+), 72 deletions(-) diff --git a/nano/store/db_val.hpp b/nano/store/db_val.hpp index 7df6cd7d..b97136ce 100644 --- a/nano/store/db_val.hpp +++ b/nano/store/db_val.hpp @@ -22,33 +22,33 @@ namespace nano::store /** * Encapsulates database values using std::span for type safety and backend independence */ -class db_val +class db_val final { public: db_val () = default; - db_val (std::span span) : - span_view (span) + db_val (std::span span) noexcept : + span_view{ span } { } - db_val (size_t size, void const * data) : - span_view (static_cast (data), size) + db_val (size_t size, void const * data) noexcept : + span_view{ static_cast (data), size } { } - db_val (std::nullptr_t) : - span_view () + db_val (std::nullptr_t) noexcept : + span_view{} { } - db_val (std::shared_ptr> buffer_a) : - buffer (buffer_a) + db_val (std::shared_ptr> buffer) noexcept : + buffer{ buffer } { convert_buffer_to_value (); } - db_val (uint64_t); + db_val (uint64_t value); db_val (nano::uint128_union const &); db_val (nano::uint256_union const &); db_val (nano::uint512_union const &); @@ -85,7 +85,7 @@ public: explicit operator nano::no_value () const; template - std::shared_ptr convert_to_block () const; + auto convert_to_block () const -> std::shared_ptr; explicit operator std::shared_ptr () const; explicit operator std::shared_ptr () const; @@ -93,22 +93,22 @@ public: explicit operator std::shared_ptr () const; explicit operator std::shared_ptr () const; - void * data () const + auto data () const noexcept -> void * { return const_cast (static_cast (span_view.data ())); } - size_t size () const + auto size () const noexcept -> size_t { return span_view.size (); } - void convert_buffer_to_value (); + auto convert_buffer_to_value () noexcept -> void; std::span span_view; std::shared_ptr> buffer; private: template - T convert () const; + auto convert () const -> T; }; } diff --git a/nano/store/db_val_templ.hpp b/nano/store/db_val_templ.hpp index 5d9f711c..8955ab23 100644 --- a/nano/store/db_val_templ.hpp +++ b/nano/store/db_val_templ.hpp @@ -10,104 +10,100 @@ namespace nano::store { -/* - * Constructors - */ +// Constructor implementations -inline db_val::db_val (uint64_t val_a) : - buffer (std::make_shared> ()) +inline db_val::db_val (uint64_t value) : + buffer{ std::make_shared> () } { { - boost::endian::native_to_big_inplace (val_a); - nano::vectorstream stream (*buffer); - nano::write (stream, val_a); + boost::endian::native_to_big_inplace (value); + nano::vectorstream stream{ *buffer }; + nano::write (stream, value); } convert_buffer_to_value (); } -inline db_val::db_val (nano::uint128_union const & val_a) : - span_view (val_a.bytes.data (), sizeof (val_a)) +inline db_val::db_val (nano::uint128_union const & value) : + span_view{ value.bytes.data (), sizeof (value) } { } -inline db_val::db_val (nano::uint256_union const & val_a) : - span_view (val_a.bytes.data (), sizeof (val_a)) +inline db_val::db_val (nano::uint256_union const & value) : + span_view{ value.bytes.data (), sizeof (value) } { } -inline db_val::db_val (nano::uint512_union const & val_a) : - span_view (val_a.bytes.data (), sizeof (val_a)) +inline db_val::db_val (nano::uint512_union const & value) : + span_view{ value.bytes.data (), sizeof (value) } { } -inline db_val::db_val (nano::qualified_root const & val_a) : - span_view (reinterpret_cast (&val_a), sizeof (val_a)) +inline db_val::db_val (nano::qualified_root const & value) : + span_view{ reinterpret_cast (&value), sizeof (value) } { } -inline db_val::db_val (nano::account_info const & val_a) : - span_view (reinterpret_cast (&val_a), val_a.db_size ()) +inline db_val::db_val (nano::account_info const & value) : + span_view{ reinterpret_cast (&value), value.db_size () } { } -inline db_val::db_val (nano::account_info_v22 const & val_a) : - span_view (reinterpret_cast (&val_a), val_a.db_size ()) +inline db_val::db_val (nano::account_info_v22 const & value) : + span_view{ reinterpret_cast (&value), value.db_size () } { } -inline db_val::db_val (nano::pending_info const & val_a) : - span_view (reinterpret_cast (&val_a), val_a.db_size ()) +inline db_val::db_val (nano::pending_info const & value) : + span_view{ reinterpret_cast (&value), value.db_size () } { static_assert (std::is_standard_layout::value, "Standard layout is required"); } -inline db_val::db_val (nano::pending_key const & val_a) : - span_view (reinterpret_cast (&val_a), sizeof (val_a)) +inline db_val::db_val (nano::pending_key const & value) : + span_view{ reinterpret_cast (&value), sizeof (value) } { static_assert (std::is_standard_layout::value, "Standard layout is required"); } -inline db_val::db_val (nano::confirmation_height_info const & val_a) : - buffer (std::make_shared> ()) +inline db_val::db_val (nano::confirmation_height_info const & value) : + buffer{ std::make_shared> () } { { - nano::vectorstream stream (*buffer); - val_a.serialize (stream); + nano::vectorstream stream{ *buffer }; + value.serialize (stream); } convert_buffer_to_value (); } -inline db_val::db_val (nano::block_info const & val_a) : - span_view (reinterpret_cast (&val_a), sizeof (val_a)) +inline db_val::db_val (nano::block_info const & value) : + span_view{ reinterpret_cast (&value), sizeof (value) } { static_assert (std::is_standard_layout::value, "Standard layout is required"); } -inline db_val::db_val (nano::endpoint_key const & val_a) : - span_view (reinterpret_cast (&val_a), sizeof (val_a)) +inline db_val::db_val (nano::endpoint_key const & value) : + span_view{ reinterpret_cast (&value), sizeof (value) } { static_assert (std::is_standard_layout::value, "Standard layout is required"); } -inline db_val::db_val (std::shared_ptr const & val_a) : - buffer (std::make_shared> ()) +inline db_val::db_val (std::shared_ptr const & block) : + buffer{ std::make_shared> () } { { - nano::vectorstream stream (*buffer); - nano::serialize_block (stream, *val_a); + nano::vectorstream stream{ *buffer }; + nano::serialize_block (stream, *block); } convert_buffer_to_value (); } -/* - * Conversion operators - */ +// Conversion operator implementations inline db_val::operator uint64_t () const { uint64_t result; - nano::bufferstream stream (span_view.data (), span_view.size ()); - auto error (nano::try_read (stream, result)); + nano::bufferstream stream{ span_view.data (), span_view.size () }; + auto error{ nano::try_read (stream, result) }; (void)error; debug_assert (!error); boost::endian::big_to_native_inplace (result); @@ -169,9 +165,9 @@ inline db_val::operator nano::pending_key () const inline db_val::operator nano::confirmation_height_info () const { - nano::bufferstream stream (span_view.data (), span_view.size ()); + nano::bufferstream stream{ span_view.data (), span_view.size () }; nano::confirmation_height_info result; - bool error (result.deserialize (stream)); + bool error{ result.deserialize (stream) }; (void)error; debug_assert (!error); return result; @@ -196,8 +192,8 @@ inline db_val::operator nano::endpoint_key () const inline db_val::operator std::shared_ptr () const { - nano::bufferstream stream (span_view.data (), span_view.size ()); - std::shared_ptr result (nano::deserialize_block (stream)); + nano::bufferstream stream{ span_view.data (), span_view.size () }; + std::shared_ptr result{ nano::deserialize_block (stream) }; return result; } @@ -218,7 +214,7 @@ inline db_val::operator nano::public_key () const inline db_val::operator std::array () const { - nano::bufferstream stream (span_view.data (), span_view.size ()); + nano::bufferstream stream{ span_view.data (), span_view.size () }; std::array result; auto error = nano::try_read (stream, result); (void)error; @@ -228,7 +224,7 @@ inline db_val::operator std::array () const inline db_val::operator nano::store::block_w_sideband () const { - nano::bufferstream stream (span_view.data (), span_view.size ()); + nano::bufferstream stream{ span_view.data (), span_view.size () }; nano::store::block_w_sideband block_w_sideband; block_w_sideband.block = (nano::deserialize_block (stream)); auto error = block_w_sideband.sideband.deserialize (stream, block_w_sideband.block->type ()); @@ -239,9 +235,9 @@ inline db_val::operator nano::store::block_w_sideband () const inline db_val::operator std::shared_ptr () const { - nano::bufferstream stream (span_view.data (), span_view.size ()); - auto error (false); - auto result (nano::make_shared (error, stream)); + nano::bufferstream stream{ span_view.data (), span_view.size () }; + auto error{ false }; + auto result{ nano::make_shared (error, stream) }; debug_assert (!error); return result; } @@ -257,11 +253,11 @@ inline db_val::operator nano::no_value () const } template -inline std::shared_ptr db_val::convert_to_block () const +inline auto db_val::convert_to_block () const -> std::shared_ptr { - nano::bufferstream stream (span_view.data (), span_view.size ()); - auto error (false); - auto result (nano::make_shared (error, stream)); + nano::bufferstream stream{ span_view.data (), span_view.size () }; + auto error{ false }; + auto result{ nano::make_shared (error, stream) }; debug_assert (!error); return result; } @@ -291,16 +287,18 @@ inline db_val::operator std::shared_ptr () const return convert_to_block (); } -inline void db_val::convert_buffer_to_value () +// Member function implementations + +inline auto db_val::convert_buffer_to_value () noexcept -> void { if (buffer) { - span_view = std::span (buffer->data (), buffer->size ()); + span_view = std::span{ buffer->data (), buffer->size () }; } } template -inline T db_val::convert () const +inline auto db_val::convert () const -> T { T result; debug_assert (span_view.size () == sizeof (result));