fix a merging error

libraries/chain/controller.cpp

@@ -2999,18 +2999,18 @@ struct controller_impl {
    } /// apply_block
 
    // called from net threads and controller's thread pool
-   bool process_vote_message( const vote_message& vote ) {
-      auto do_vote = [&vote](auto& forkdb) -> std::pair<bool, std::optional<uint32_t>> {
+   vote_status process_vote_message( const vote_message& vote ) {
+      auto do_vote = [&vote](auto& forkdb) -> std::pair<vote_status, std::optional<uint32_t>> {
           auto bsp = forkdb.get_block(vote.proposal_id);
           if (bsp)
              return bsp->aggregate_vote(vote);
-          return {false, {}};
+          return {vote_status::unknown_block, {}};
       };
-      auto [valid, new_lib] = fork_db.apply_if<std::pair<bool, std::optional<uint32_t>>>(do_vote);
+      auto [status, new_lib] = fork_db.apply_if<std::pair<vote_status, std::optional<uint32_t>>>(do_vote);
       if (new_lib) {
          set_if_irreversible_block_num(*new_lib);
       }
-      return valid;
+      return status;
    };
 
    void create_and_send_vote_msg(const block_state_ptr& bsp) {
@@ -4402,7 +4402,7 @@ void controller::set_proposed_finalizers( const finalizer_policy& fin_pol ) {
 }
 
 // called from net threads
-bool controller::process_vote_message( const vote_message& vote ) {
+vote_status controller::process_vote_message( const vote_message& vote ) {
    return my->process_vote_message( vote );
 };