From aeed10f48bfb922a593859526c0a01db485912cb Mon Sep 17 00:00:00 2001 From: clemahieu Date: Mon, 9 May 2022 13:02:13 +0100 Subject: [PATCH] Within confirm_ack, removing size calculation for vote-by-block. --- nano/node/common.cpp | 14 +++----------- nano/node/common.hpp | 2 +- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/nano/node/common.cpp b/nano/node/common.cpp index 357ef7d5..5a3462ee 100644 --- a/nano/node/common.cpp +++ b/nano/node/common.cpp @@ -285,7 +285,7 @@ std::size_t nano::message_header::payload_length_bytes () const } case nano::message_type::confirm_ack: { - return nano::confirm_ack::size (block_type (), count_get ()); + return nano::confirm_ack::size (count_get ()); } case nano::message_type::confirm_req: { @@ -860,17 +860,9 @@ void nano::confirm_ack::visit (nano::message_visitor & visitor_a) const visitor_a.confirm_ack (*this); } -std::size_t nano::confirm_ack::size (nano::block_type type_a, std::size_t count) +std::size_t nano::confirm_ack::size (std::size_t count) { - std::size_t result (sizeof (nano::account) + sizeof (nano::signature) + sizeof (uint64_t)); - if (type_a != nano::block_type::invalid && type_a != nano::block_type::not_a_block) - { - result += nano::block::size (type_a); - } - else if (type_a == nano::block_type::not_a_block) - { - result += count * sizeof (nano::block_hash); - } + std::size_t result = sizeof (nano::account) + sizeof (nano::signature) + sizeof (uint64_t) + count * sizeof (nano::block_hash); return result; } diff --git a/nano/node/common.hpp b/nano/node/common.hpp index d9784aa5..d104e513 100644 --- a/nano/node/common.hpp +++ b/nano/node/common.hpp @@ -347,7 +347,7 @@ public: void visit (nano::message_visitor &) const override; bool operator== (nano::confirm_ack const &) const; std::shared_ptr vote; - static std::size_t size (nano::block_type, std::size_t = 0); + static std::size_t size (std::size_t count); }; class frontier_req final : public message