diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt index 048df201cc..b59d39fced 100644 --- a/libraries/chain/CMakeLists.txt +++ b/libraries/chain/CMakeLists.txt @@ -83,7 +83,6 @@ set(CHAIN_HOTSTUFF_SOURCES hotstuff/chain_pacemaker.cpp hotstuff/instant_finality_extension.cpp hotstuff/qc_chain.cpp - hotstuff/finalizer_policy.cpp hotstuff/hotstuff.cpp ) diff --git a/libraries/chain/hotstuff/finalizer_policy.cpp b/libraries/chain/hotstuff/finalizer_policy.cpp deleted file mode 100644 index a2ae00082e..0000000000 --- a/libraries/chain/hotstuff/finalizer_policy.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include -#include - -namespace eosio::chain { - - /** - * These definitions are all here to avoid including bls_public_key.hpp which includes - * and pulls in bls12-381 types. This keeps bls12-381 out of libtester. - */ - - finalizer_policy::finalizer_policy() = default; - finalizer_policy::~finalizer_policy() = default; - - finalizer_policy::finalizer_policy(const finalizer_policy&) = default; - finalizer_policy::finalizer_policy(finalizer_policy&&) noexcept = default; - - finalizer_policy& finalizer_policy::operator=(const finalizer_policy&) = default; - finalizer_policy& finalizer_policy::operator=(finalizer_policy&&) noexcept = default; - -} /// eosio::chain diff --git a/libraries/chain/include/eosio/chain/hotstuff/finalizer_policy.hpp b/libraries/chain/include/eosio/chain/hotstuff/finalizer_policy.hpp index 2e35b26ce2..89c75d1994 100644 --- a/libraries/chain/include/eosio/chain/hotstuff/finalizer_policy.hpp +++ b/libraries/chain/include/eosio/chain/hotstuff/finalizer_policy.hpp @@ -6,15 +6,6 @@ namespace eosio::chain { struct finalizer_policy { - finalizer_policy(); - ~finalizer_policy(); - - finalizer_policy(const finalizer_policy&); - finalizer_policy(finalizer_policy&&) noexcept; - - finalizer_policy& operator=(const finalizer_policy&); - finalizer_policy& operator=(finalizer_policy&&) noexcept; - uint32_t generation = 0; ///< sequentially incrementing version number uint64_t threshold = 0; ///< vote weight threshold to finalize blocks std::vector finalizers; ///< Instant Finality voter set diff --git a/libraries/chain/include/eosio/chain/hotstuff/proposal_info.hpp b/libraries/chain/include/eosio/chain/hotstuff/proposal_info.hpp deleted file mode 100644 index 96e768f8c7..0000000000 --- a/libraries/chain/include/eosio/chain/hotstuff/proposal_info.hpp +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include - -namespace eosio::chain { - - struct proposal_info_t { - uint32_t last_qc_block_height {0}; ///< The block height of the most recent ancestor block that has a QC justification - bool is_last_qc_strong {false}; ///< whether the QC for the block referenced by last_qc_block_height is strong or weak. - }; - - using proposal_info_ptr = std::shared_ptr; - - /** - * Block Header Extension Compatibility - */ - struct proposal_info_extension : proposal_info_t { - static constexpr uint16_t extension_id() { return 3; } - static constexpr bool enforce_unique() { return true; } - }; - -} /// eosio::chain - -FC_REFLECT( eosio::chain::proposal_info_t, (last_qc_block_height)(is_last_qc_strong) ) -FC_REFLECT_DERIVED( eosio::chain::proposal_info_extension, (eosio::chain::proposal_info_t), ) \ No newline at end of file