From 5294beaa31d70a1fce8c33856ba0b81589c23647 Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Sun, 16 Dec 2018 14:24:22 -0800 Subject: [PATCH] Election epoch time start fixes (#1455) --- rai/node/node.cpp | 2 +- rai/node/node.hpp | 2 +- rai/node/rpc.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rai/node/node.cpp b/rai/node/node.cpp index 9ef40225..963e8838 100644 --- a/rai/node/node.cpp +++ b/rai/node/node.cpp @@ -2916,7 +2916,7 @@ void rai::election::confirm_once (rai::transaction const & transaction_a) { if (!confirmed.exchange (true)) { - status.election_end = std::chrono::steady_clock::now (); + status.election_end = std::chrono::duration_cast (std::chrono::system_clock::now ().time_since_epoch ()); status.election_duration = std::chrono::duration_cast (std::chrono::steady_clock::now () - election_start); auto winner_l (status.winner); auto node_l (node.shared ()); diff --git a/rai/node/node.hpp b/rai/node/node.hpp index f78821fe..b2c519d8 100644 --- a/rai/node/node.hpp +++ b/rai/node/node.hpp @@ -29,7 +29,7 @@ class election_status public: std::shared_ptr winner; rai::amount tally; - std::chrono::steady_clock::time_point election_end; + std::chrono::milliseconds election_end; std::chrono::milliseconds election_duration; }; class vote_info diff --git a/rai/node/rpc.cpp b/rai/node/rpc.cpp index 17b63335..099e4af2 100644 --- a/rai/node/rpc.cpp +++ b/rai/node/rpc.cpp @@ -1454,7 +1454,7 @@ void rai::rpc_handler::confirmation_history () boost::property_tree::ptree election; election.put ("hash", i->winner->hash ().to_string ()); 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 ()); elections.push_back (std::make_pair ("", election)); running_total += i->election_duration;