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

Election epoch time start fixes (#1455)

Browse source
This commit is contained in:
Russel Waters 2018-12-16 14:24:22 -08:00 • committed by Roy Keene
commit 5294beaa31
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rai/node/node.cpp
View file

@ -2916,7 +2916,7 @@ void rai::election::confirm_once (rai::transaction const & transaction_a)
{ {
if (!confirmed.exchange (true)) if (!confirmed.exchange (true))
{ {
status.election_end = std::chrono::steady_clock::now (); 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.election_duration = std::chrono::duration_cast<std::chrono::milliseconds> (std::chrono::steady_clock::now () - election_start);
auto winner_l (status.winner); auto winner_l (status.winner);
auto node_l (node.shared ()); auto node_l (node.shared ());

2
rai/node/node.hpp
View file

@ -29,7 +29,7 @@ class election_status
public: public:
std::shared_ptr<rai::block> winner; std::shared_ptr<rai::block> winner;
rai::amount tally; rai::amount tally;
std::chrono::steady_clock::time_point election_end; std::chrono::milliseconds election_end;
std::chrono::milliseconds election_duration; std::chrono::milliseconds election_duration;
}; };
class vote_info class vote_info

2
rai/node/rpc.cpp
View file

@ -1454,7 +1454,7 @@ void rai::rpc_handler::confirmation_history ()
boost::property_tree::ptree election; boost::property_tree::ptree election;
election.put ("hash", i->winner->hash ().to_string ()); election.put ("hash", i->winner->hash ().to_string ());
election.put ("duration", i->election_duration.count ()); election.put ("duration", i->election_duration.count ());
election.put ("time", i->election_end.time_since_epoch ().count ()); election.put ("time", i->election_end.count ());
election.put ("tally", i->tally.to_string_dec ()); election.put ("tally", i->tally.to_string_dec ());
elections.push_back (std::make_pair ("", election)); elections.push_back (std::make_pair ("", election));
running_total += i->election_duration; running_total += i->election_duration;