GH-1980 Fix merge issue

AntelopeIO · Jan 12, 2024 · e896105 · e896105
1 parent 2c98018
commit e896105
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libraries/chain/block_header_state.cpp b/libraries/chain/block_header_state.cpp
@@ -127,7 +127,7 @@ block_header_state block_header_state::next(block_header_state_input& input) con
  */
 block_header_state block_header_state::next(const signed_block_header& h, const protocol_feature_set& pfs,
                                             validator_t& validator) const {
-   auto producer = detail::get_scheduled_producer(proposer_policy->proposer_schedule.producers, h.timestamp).producer_name;
+   auto producer = detail::get_scheduled_producer(active_proposer_policy->proposer_schedule.producers, h.timestamp).producer_name;
 
    EOS_ASSERT( h.previous == id, unlinkable_block_exception, "previous mismatch" );
    EOS_ASSERT( h.producer == producer, wrong_producer, "wrong producer specified" );

diff --git a/libraries/chain/controller.cpp b/libraries/chain/controller.cpp
@@ -915,7 +915,7 @@ struct pending_state {
       _db_session.push();
    }
 
-   //bool is_dpos() const { return std::visit([](const auto& stage) { return stage.is_dpos(); }, _block_stage); }
+   bool is_dpos() const { return std::visit([](const auto& stage) { return stage.is_dpos(); }, _block_stage); }
 
    const block_signing_authority& pending_block_signing_authority() const {
       return std::visit(