From de8d66ecae019e4028594877e0d54e91236d9bc4 Mon Sep 17 00:00:00 2001
From: Guilherme Lawless <guilherme@nano.org>
Date: Mon, 2 Mar 2020 19:35:15 +0000
Subject: [PATCH] Moving election status definitions to secure/common

---
 nano/node/active_transactions.hpp |  2 --
 nano/node/election.hpp            | 20 --------------------
 nano/secure/common.hpp            | 24 ++++++++++++++++++++++++
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/nano/node/active_transactions.hpp b/nano/node/active_transactions.hpp
index 464820d0a6..099aa80994 100644
--- a/nano/node/active_transactions.hpp
+++ b/nano/node/active_transactions.hpp
@@ -26,11 +26,9 @@ class node;
 class block;
 class block_sideband;
 class election;
-class election_status;
 class vote;
 class transaction;
 class confirmation_height_processor;
-enum class election_status_type : uint8_t;
 
 class conflict_info final
 {
diff --git a/nano/node/election.hpp b/nano/node/election.hpp
index 3414e3b65a..9339cc2b01 100644
--- a/nano/node/election.hpp
+++ b/nano/node/election.hpp
@@ -14,26 +14,6 @@ namespace nano
 class channel;
 class confirmation_solicitor;
 class node;
-enum class election_status_type : uint8_t
-{
-	ongoing = 0,
-	active_confirmed_quorum = 1,
-	active_confirmation_height = 2,
-	inactive_confirmation_height = 3,
-	stopped = 5
-};
-class election_status final
-{
-public:
-	std::shared_ptr<nano::block> winner;
-	nano::amount tally;
-	std::chrono::milliseconds election_end;
-	std::chrono::milliseconds election_duration;
-	unsigned confirmation_request_count;
-	unsigned block_count;
-	unsigned voter_count;
-	election_status_type type;
-};
 class vote_info final
 {
 public:
diff --git a/nano/secure/common.hpp b/nano/secure/common.hpp
index 715ab3e19f..a340cb8b79 100644
--- a/nano/secure/common.hpp
+++ b/nano/secure/common.hpp
@@ -506,5 +506,29 @@ class ledger_cache
 	std::atomic<uint64_t> account_count{ 0 };
 };
 
+/* Defines the possible states for an election to stop in */
+enum class election_status_type : uint8_t
+{
+	ongoing = 0,
+	active_confirmed_quorum = 1,
+	active_confirmation_height = 2,
+	inactive_confirmation_height = 3,
+	stopped = 5
+};
+
+/* Holds a summary of an election */
+class election_status final
+{
+public:
+	std::shared_ptr<nano::block> winner;
+	nano::amount tally;
+	std::chrono::milliseconds election_end;
+	std::chrono::milliseconds election_duration;
+	unsigned confirmation_request_count;
+	unsigned block_count;
+	unsigned voter_count;
+	election_status_type type;
+};
+
 nano::wallet_id random_wallet_id ();
 }