dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove unused serialize/deserialize function that look confusingly similar to the ones actually used. These show up as dead code in coverage scans. https://coveralls.io/builds/48728513/source?filename=nano%2Fsecure%2Fcommon.cpp#L687

Browse source
This commit is contained in:
clemahieu 2022-05-04 22:01:13 +01:00
commit 8a2a0b35ed
No known key found for this signature in database
GPG key ID: 43708520C8DFB938
2 changed files with 12 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

95
nano/secure/common.cpp
View file

@ -557,47 +557,9 @@ nano::vote::vote (nano::vote const & other_a) :
{ {
} }
nano::vote::vote (bool & error_a, nano::stream & stream_a, nano::block_uniquer * uniquer_a)
{
error_a = deserialize (stream_a, uniquer_a);
}
nano::vote::vote (bool & error_a, nano::stream & stream_a, nano::block_type type_a, nano::block_uniquer * uniquer_a) nano::vote::vote (bool & error_a, nano::stream & stream_a, nano::block_type type_a, nano::block_uniquer * uniquer_a)
{ {
try error_a = deserialize (stream_a, type_a, uniquer_a);
{
nano::read (stream_a, account.bytes);
nano::read (stream_a, signature.bytes);
nano::read (stream_a, timestamp_m);
while (stream_a.in_avail () > 0)
{
if (type_a == nano::block_type::not_a_block)
{
nano::block_hash block_hash;
nano::read (stream_a, block_hash);
blocks.push_back (block_hash);
}
else
{
auto block (nano::deserialize_block (stream_a, type_a, uniquer_a));
if (block == nullptr)
{
throw std::runtime_error ("Block is null");
}
blocks.push_back (block);
}
}
}
catch (std::runtime_error const &)
{
error_a = true;
}
if (blocks.empty ())
{
error_a = true;
}
} }
nano::vote::vote (nano::account const & account_a, nano::raw_key const & prv_a, uint64_t timestamp_a, uint8_t duration, std::shared_ptr<nano::block> const & block_a) : nano::vote::vote (nano::account const & account_a, nano::raw_key const & prv_a, uint64_t timestamp_a, uint8_t duration, std::shared_ptr<nano::block> const & block_a) :
@ -694,46 +656,18 @@ void nano::vote::serialize (nano::stream & stream_a, nano::block_type type) cons
} }
} }
void nano::vote::serialize (nano::stream & stream_a) const bool nano::vote::deserialize (nano::stream & stream_a, nano::block_type type_a, nano::block_uniquer * uniquer_a)
{ {
write (stream_a, account); auto result = false;
write (stream_a, signature);
write (stream_a, boost::endian::native_to_little (timestamp_m));
for (auto const & block : blocks)
{
if (block.which ())
{
write (stream_a, nano::block_type::not_a_block);
write (stream_a, boost::get<nano::block_hash> (block));
}
else
{
nano::serialize_block (stream_a, *boost::get<std::shared_ptr<nano::block>> (block));
}
}
}
bool nano::vote::deserialize (nano::stream & stream_a, nano::block_uniquer * uniquer_a)
{
auto error (false);
try try
{ {
nano::read (stream_a, account); nano::read (stream_a, account.bytes);
nano::read (stream_a, signature); nano::read (stream_a, signature.bytes);
nano::read (stream_a, timestamp_m); nano::read (stream_a, timestamp_m);
boost::endian::little_to_native_inplace (timestamp_m);
nano::block_type type; while (stream_a.in_avail () > 0)
while (true)
{ {
if (nano::try_read (stream_a, type)) if (type_a == nano::block_type::not_a_block)
{
// Reached the end of the stream
break;
}
if (type == nano::block_type::not_a_block)
{ {
nano::block_hash block_hash; nano::block_hash block_hash;
nano::read (stream_a, block_hash); nano::read (stream_a, block_hash);
@ -741,27 +675,20 @@ bool nano::vote::deserialize (nano::stream & stream_a, nano::block_uniquer * uni
} }
else else
{ {
auto block (nano::deserialize_block (stream_a, type, uniquer_a)); auto block (nano::deserialize_block (stream_a, type_a, uniquer_a));
if (block == nullptr) if (block == nullptr)
{ {
throw std::runtime_error ("Block is empty"); throw std::runtime_error ("Block is null");
} }
blocks.push_back (block); blocks.push_back (block);
} }
} }
} }
catch (std::runtime_error const &) catch (std::runtime_error const &)
{ {
error = true; result = true;
} }
return result;
if (blocks.empty ())
{
error = true;
}
return error;
} }
bool nano::vote::validate () const bool nano::vote::validate () const

2
nano/secure/common.hpp
View file

@ -270,7 +270,7 @@ public:
void serialize (nano::stream &, nano::block_type) const; void serialize (nano::stream &, nano::block_type) const;
void serialize (nano::stream &) const; void serialize (nano::stream &) const;
void serialize_json (boost::property_tree::ptree & tree) const; void serialize_json (boost::property_tree::ptree & tree) const;
bool deserialize (nano::stream &, nano::block_uniquer * = nullptr); bool deserialize (nano::stream &, nano::block_type, nano::block_uniquer * = nullptr);
bool validate () const; bool validate () const;
boost::transform_iterator<nano::iterate_vote_blocks_as_hash, nano::vote_blocks_vec_iter> begin () const; boost::transform_iterator<nano::iterate_vote_blocks_as_hash, nano::vote_blocks_vec_iter> begin () const;
boost::transform_iterator<nano::iterate_vote_blocks_as_hash, nano::vote_blocks_vec_iter> end () const; boost::transform_iterator<nano::iterate_vote_blocks_as_hash, nano::vote_blocks_vec_iter> end () const;