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

Add block and voters count in election information (#2414)

Browse source 
* Add block and voters count in election information

* Blocks already included in confirmation_info

* Status is not yet updated before the election is finished
This commit is contained in:
Guilherme Lawless 2019-12-05 19:08:21 +00:00 • committed by GitHub
commit b58ee7f420
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nano/core_test/websocket.cpp
View file

@ -467,6 +467,8 @@ TEST (websocket, confirmation_options)
// Duration and request count may be zero on testnet, so we only check that they're present
ASSERT_EQ (1, election_info.count ("duration"));
ASSERT_EQ (1, election_info.count ("request_count"));
ASSERT_EQ (1, election_info.count ("voters"));
ASSERT_GE (1, election_info.get<unsigned> ("blocks"));
// Make sure tally and time are non-zero.
ASSERT_NE ("0", tally);
ASSERT_NE ("0", time);

2
nano/node/active_transactions.cpp
View file

@ -114,7 +114,7 @@ void nano::active_transactions::post_confirmation_height_set (nano::transaction
bool is_state_send (false);
nano::account pending_account (0);
node.process_confirmed_data (transaction_a, block_a, block_a->hash (), sideband_a, account, amount, is_state_send, pending_account);
node.observers.blocks.notify (nano::election_status{ block_a, 0, std::chrono::duration_cast<std::chrono::milliseconds> (std::chrono::system_clock::now ().time_since_epoch ()), std::chrono::duration_values<std::chrono::milliseconds>::zero (), 0, nano::election_status_type::inactive_confirmation_height }, account, amount, is_state_send);
node.observers.blocks.notify (nano::election_status{ block_a, 0, std::chrono::duration_cast<std::chrono::milliseconds> (std::chrono::system_clock::now ().time_since_epoch ()), std::chrono::duration_values<std::chrono::milliseconds>::zero (), 0, 1, 0, nano::election_status_type::inactive_confirmation_height }, account, amount, is_state_send);
}
else
{

2
nano/node/active_transactions.hpp
View file

@ -56,6 +56,8 @@ public:
std::chrono::milliseconds election_end;
std::chrono::milliseconds election_duration;
unsigned confirmation_request_count;
unsigned block_count;
unsigned voter_count;
election_status_type type;
};

8
nano/node/election.cpp
View file

@ -13,7 +13,7 @@ nano::election::election (nano::node & node_a, std::shared_ptr<nano::block> bloc
confirmation_action (confirmation_action_a),
node (node_a),
election_start (std::chrono::steady_clock::now ()),
status ({ block_a, 0, std::chrono::duration_cast<std::chrono::milliseconds> (std::chrono::system_clock::now ().time_since_epoch ()), std::chrono::duration_values<std::chrono::milliseconds>::zero (), 0, nano::election_status_type::ongoing }),
status ({ block_a, 0, std::chrono::duration_cast<std::chrono::milliseconds> (std::chrono::system_clock::now ().time_since_epoch ()), std::chrono::duration_values<std::chrono::milliseconds>::zero (), 0, 1, 0, nano::election_status_type::ongoing }),
skip_delay (skip_delay_a),
confirmed (false),
stopped (false)
@ -36,11 +36,14 @@ void nano::election::compute_rep_votes (nano::transaction const & transaction_a)
void nano::election::confirm_once (nano::election_status_type type_a)
{
assert (!node.active.mutex.try_lock ());
if (!confirmed.exchange (true))
{
status.election_end = std::chrono::duration_cast<std::chrono::milliseconds> (std::chrono::system_clock::now ().time_since_epoch ());
status.election_duration = std::chrono::duration_cast<std::chrono::milliseconds> (std::chrono::steady_clock::now () - election_start);
status.confirmation_request_count = confirmation_request_count;
status.block_count = blocks.size ();
status.voter_count = last_votes.size ();
status.type = type_a;
auto status_l (status);
auto node_l (node.shared ());
@ -59,12 +62,15 @@ void nano::election::confirm_once (nano::election_status_type type_a)
void nano::election::stop ()
{
assert (!node.active.mutex.try_lock ());
if (!stopped && !confirmed)
{
stopped = true;
status.election_end = std::chrono::duration_cast<std::chrono::milliseconds> (std::chrono::system_clock::now ().time_since_epoch ());
status.election_duration = std::chrono::duration_cast<std::chrono::milliseconds> (std::chrono::steady_clock::now () - election_start);
status.confirmation_request_count = confirmation_request_count;
status.block_count = blocks.size ();
status.voter_count = last_votes.size ();
status.type = nano::election_status_type::stopped;
}
}

11
nano/node/json_handler.cpp
View file

@ -1011,7 +1011,7 @@ void nano::json_handler::block_confirm ()
else
{
// Add record in confirmation history for confirmed block
nano::election_status status{ block_l, 0, std::chrono::duration_cast<std::chrono::milliseconds> (std::chrono::system_clock::now ().time_since_epoch ()), std::chrono::duration_values<std::chrono::milliseconds>::zero (), 0, nano::election_status_type::active_confirmation_height };
nano::election_status status{ block_l, 0, std::chrono::duration_cast<std::chrono::milliseconds> (std::chrono::system_clock::now ().time_since_epoch ()), std::chrono::duration_values<std::chrono::milliseconds>::zero (), 0, 1, 0, nano::election_status_type::active_confirmation_height };
{
nano::lock_guard<std::mutex> lock (node.active.mutex);
node.active.confirmed.push_back (status);
@ -1806,7 +1806,9 @@ void nano::json_handler::confirmation_history ()
election.put ("duration", i->election_duration.count ());
election.put ("time", i->election_end.count ());
election.put ("tally", i->tally.to_string_dec ());
election.put ("request_count", i->confirmation_request_count);
election.put ("blocks", std::to_string (i->block_count));
election.put ("voters", std::to_string (i->voter_count));
election.put ("request_count", std::to_string (i->confirmation_request_count));
elections.push_back (std::make_pair ("", election));
}
running_total += i->election_duration;
@ -1835,10 +1837,11 @@ void nano::json_handler::confirmation_info ()
auto conflict_info (node.active.roots.find (root));
if (conflict_info != node.active.roots.end ())
{
response_l.put ("announcements", std::to_string (conflict_info->election->confirmation_request_count));
auto election (conflict_info->election);
nano::uint128_t total (0);
response_l.put ("announcements", std::to_string (election->confirmation_request_count));
response_l.put ("voters", std::to_string (election->last_votes.size ()));
response_l.put ("last_winner", election->status.winner->hash ().to_string ());
nano::uint128_t total (0);
auto tally_l (election->tally ());
boost::property_tree::ptree blocks;
for (auto i (tally_l.begin ()), n (tally_l.end ()); i != n; ++i)

4
nano/node/websocket.cpp
View file

@ -634,7 +634,9 @@ nano::websocket::message nano::websocket::message_builder::block_confirmed (std:
election_node_l.add ("duration", election_status_a.election_duration.count ());
election_node_l.add ("time", election_status_a.election_end.count ());
election_node_l.add ("tally", election_status_a.tally.to_string_dec ());
election_node_l.add ("request_count", election_status_a.confirmation_request_count);
election_node_l.add ("blocks", std::to_string (election_status_a.block_count));
election_node_l.add ("voters", std::to_string (election_status_a.voter_count));
election_node_l.add ("request_count", std::to_string (election_status_a.confirmation_request_count));
message_node_l.add_child ("election_info", election_node_l);
}

2
nano/rpc_test/rpc.cpp
View file

@ -6148,6 +6148,8 @@ TEST (rpc, confirmation_history)
ASSERT_EQ (1, item->second.count ("duration"));
ASSERT_EQ (1, item->second.count ("time"));
ASSERT_EQ (1, item->second.count ("request_count"));
ASSERT_EQ (1, item->second.count ("voters"));
ASSERT_GE (1, item->second.get<unsigned> ("blocks"));
ASSERT_EQ (block->hash ().to_string (), hash);
nano::amount tally_num;
tally_num.decode_dec (tally);