From d0663837d2800948cd51dfd8e2c7f74d293c86ff Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Mon, 21 Jan 2019 12:18:39 +0000 Subject: core: move hardforks into its own lib So it can be used by others without encumbrance --- src/cryptonote_basic/hardfork.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/cryptonote_basic/hardfork.h') diff --git a/src/cryptonote_basic/hardfork.h b/src/cryptonote_basic/hardfork.h index 123978b12..987dcc75a 100644 --- a/src/cryptonote_basic/hardfork.h +++ b/src/cryptonote_basic/hardfork.h @@ -29,6 +29,7 @@ #pragma once #include "syncobj.h" +#include "hardforks/hardforks.h" #include "cryptonote_basic/cryptonote_basic.h" namespace cryptonote @@ -230,14 +231,6 @@ namespace cryptonote */ uint64_t get_window_size() const { return window_size; } - struct Params { - uint8_t version; - uint8_t threshold; - uint64_t height; - time_t time; - Params(uint8_t version, uint64_t height, uint8_t threshold, time_t time): version(version), threshold(threshold), height(height), time(time) {} - }; - private: uint8_t get_block_version(uint64_t height) const; @@ -262,7 +255,7 @@ namespace cryptonote uint8_t original_version; uint64_t original_version_till_height; - std::vector heights; + std::vector heights; std::deque versions; /* rolling window of the last N blocks' versions */ unsigned int last_versions[256]; /* count of the block versions in the last N blocks */ -- cgit v1.2.3