Merge pull request #771 from evoskuil/master

Make chain_state pointers const.

Author: evoskuil

include/bitcoin/node/chasers/chaser_organize.hpp

@@ -51,7 +51,7 @@ class chaser_organize
     struct block_state
     {
         typename Block::cptr block;
-        chain_state::ptr state;
+        chain_state::cptr state;
     };
     using block_tree = std::unordered_map<system::hash_cref, block_state>;
     using header_links = std_vector<database::header_link>;
@@ -152,13 +152,13 @@ class chaser_organize
 
     // Store Block into logical tree cache.
     void cache(const typename Block::cptr& block,
-        const chain_state::ptr& state) NOEXCEPT;
+        const chain_state::cptr& state) NOEXCEPT;
 
     // Getters.
     // ------------------------------------------------------------------------
 
     // Obtain chain state for given previous hash, nullptr if not found.
-    chain_state::ptr get_chain_state(
+    chain_state::cptr get_chain_state(
         const system::hash_digest& previous_hash) const NOEXCEPT;
 
     // Sum of work from header to branch point (excluded).
@@ -183,7 +183,7 @@ class chaser_organize
 
     // These are protected by strand.
     bool bumped_{};
-    chain_state::ptr state_{};
+    chain_state::cptr state_{};
 
     // TODO: optimize, default bucket count is around 8.
     block_tree tree_{};

include/bitcoin/node/impl/chasers/chaser_organize.ipp

@@ -29,8 +29,6 @@
 namespace libbitcoin {
 namespace node {
 
-BC_PUSH_WARNING(NO_NEW_OR_DELETE)
-
 // Public
 // ----------------------------------------------------------------------------
 
@@ -372,7 +370,7 @@ void CLASS::do_disorganize(header_t link) NOEXCEPT
 
         using namespace system;
         const auto& header = get_header(*block);
-        state.reset(new chain::chain_state{ *state, header, settings_ });
+        state = to_shared<chain::chain_state>(*state, header, settings_);
         cache(block, state);
     }
 
@@ -495,7 +493,7 @@ code CLASS::push_block(const system::hash_digest& key) NOEXCEPT
 
 TEMPLATE
 void CLASS::cache(const typename Block::cptr& block,
-    const chain_state::ptr& state) NOEXCEPT
+    const chain_state::cptr& state) NOEXCEPT
 {
     tree_.emplace(system::hash_cref(block->get_hash()),
         block_state{ block, state });
@@ -505,7 +503,7 @@ void CLASS::cache(const typename Block::cptr& block,
 // ----------------------------------------------------------------------------
 
 TEMPLATE
-CLASS::chain_state::ptr CLASS::get_chain_state(
+CLASS::chain_state::cptr CLASS::get_chain_state(
     const system::hash_digest& previous_hash) const NOEXCEPT
 {
     if (!state_)
@@ -638,8 +636,6 @@ void CLASS::log_state_change(const chain_state& from,
     }
 }
 
-BC_POP_WARNING()
-
 } // namespace node
 } // namespace libbitcoin