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

Refactor election vote (#4119)

Browse source 
Refactoring nano::election::vote method according to #4108.
Main goals:

Reduce nesting of if statements
Use early returns
Simplify longer if statement.
This commit is contained in:
JerzyStanislawski 2023-02-17 13:32:08 +01:00 • committed by GitHub
commit b3f0c53008
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

77
nano/node/election.cpp
View file

@ -372,57 +372,54 @@ std::shared_ptr<nano::block> nano::election::find (nano::block_hash const & hash
nano::election_vote_result nano::election::vote (nano::account const & rep, uint64_t timestamp_a, nano::block_hash const & block_hash_a, vote_source vote_source_a) nano::election_vote_result nano::election::vote (nano::account const & rep, uint64_t timestamp_a, nano::block_hash const & block_hash_a, vote_source vote_source_a)
{ {
auto replay = false;
auto weight = node.ledger.weight (rep); auto weight = node.ledger.weight (rep);
auto should_process = false; if (!node.network_params.network.is_dev_network () && weight <= node.minimum_principal_weight ())
if (node.network_params.network.is_dev_network () || weight > node.minimum_principal_weight ())
{ {
nano::unique_lock<nano::mutex> lock{ mutex }; return nano::election_vote_result (false, false);
}
nano::unique_lock<nano::mutex> lock{ mutex };
auto last_vote_it (last_votes.find (rep)); auto last_vote_it (last_votes.find (rep));
if (last_vote_it == last_votes.end ()) if (last_vote_it != last_votes.end ())
{
auto last_vote_l (last_vote_it->second);
if (last_vote_l.timestamp > timestamp_a)
{ {
should_process = true; return nano::election_vote_result (true, false);
} }
else if (last_vote_l.timestamp == timestamp_a && !(last_vote_l.hash < block_hash_a))
{ {
auto last_vote_l (last_vote_it->second); return nano::election_vote_result (true, false);
if (last_vote_l.timestamp < timestamp_a || (last_vote_l.timestamp == timestamp_a && last_vote_l.hash < block_hash_a))
{
auto max_vote = timestamp_a == std::numeric_limits<uint64_t>::max () && last_vote_l.timestamp < timestamp_a;
bool past_cooldown = true;
// Only cooldown live votes
if (vote_source_a == vote_source::live)
{
const auto cooldown = cooldown_time (weight);
past_cooldown = last_vote_l.time <= std::chrono::steady_clock::now () - cooldown;
}
should_process = max_vote || past_cooldown;
}
else
{
replay = true;
}
} }
if (should_process)
auto max_vote = timestamp_a == std::numeric_limits<uint64_t>::max () && last_vote_l.timestamp < timestamp_a;
bool past_cooldown = true;
// Only cooldown live votes
if (vote_source_a == vote_source::live)
{ {
last_votes[rep] = { std::chrono::steady_clock::now (), timestamp_a, block_hash_a }; const auto cooldown = cooldown_time (weight);
if (vote_source_a == vote_source::live) past_cooldown = last_vote_l.time <= std::chrono::steady_clock::now () - cooldown;
{ }
live_vote_action (rep);
}
node.stats.inc (nano::stat::type::election, vote_source_a == vote_source::live ? nano::stat::detail::vote_new : nano::stat::detail::vote_cached); if (!max_vote && !past_cooldown)
{
if (!confirmed ()) return nano::election_vote_result (false, false);
{
confirm_if_quorum (lock);
}
} }
} }
return nano::election_vote_result (replay, should_process); last_votes[rep] = { std::chrono::steady_clock::now (), timestamp_a, block_hash_a };
if (vote_source_a == vote_source::live)
{
live_vote_action (rep);
}
node.stats.inc (nano::stat::type::election, vote_source_a == vote_source::live ? nano::stat::detail::vote_new : nano::stat::detail::vote_cached);
if (!confirmed ())
{
confirm_if_quorum (lock);
}
return nano::election_vote_result (false, true);
} }
bool nano::election::publish (std::shared_ptr<nano::block> const & block_a) bool nano::election::publish (std::shared_ptr<nano::block> const & block_a)