Merge pull request #1645 from evoskuil/master

Make chain_state pointers const.

Author: evoskuil

include/bitcoin/system/chain/chain_state.hpp

@@ -49,7 +49,7 @@ class BC_API chain_state
     typedef std::deque<uint32_t> bitss;
     typedef std::deque<uint32_t> versions;
     typedef std::deque<uint32_t> timestamps;
-    typedef std::shared_ptr<chain_state> ptr;
+    typedef std::shared_ptr<const chain_state> cptr;
     typedef struct { size_t count; size_t high; } range;
 
     /// Heights used to identify construction requirements.

include/bitcoin/system/impl/machine/interpreter.ipp

@@ -1649,7 +1649,6 @@ connect(const context& state, const transaction& tx,
     return error::script_success;
 }
 
-BC_PUSH_WARNING(NO_NEW_OR_DELETE)
 BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
 
 template <typename Stack>
@@ -1695,7 +1694,6 @@ code interpreter<Stack>::connect_embedded(const context& state,
     return error::script_success;
 }
 
-BC_POP_WARNING()
 BC_POP_WARNING()
 
 template <typename Stack>

src/chain/block.cpp

@@ -878,7 +878,7 @@ code block::identify(const context& ctx) const NOEXCEPT
 // In the case of validation failure
 // The block header is checked/accepted independently.
 
-// TODO: use of get_hash() in is_forward_reference makes this thread-unsafe.
+// Use of get_hash() in is_forward_reference makes this thread-unsafe.
 code block::check() const NOEXCEPT
 {
     // empty_block is subset of first_not_coinbase.
@@ -908,7 +908,7 @@ code block::check() const NOEXCEPT
 // timestamp
 // median_time_past
 
-// TODO: use of get_hash() in is_hash_limit_exceeded makes this thread-unsafe.
+// Use of get_hash() in is_hash_limit_exceeded makes this thread-unsafe.
 // bip141 should be disabled when the node is not accepting witness data.
 code block::check(const context& ctx) const NOEXCEPT
 {

src/chain/input.cpp

@@ -48,19 +48,14 @@ static_assert(max_script_size <
 // static/private
 const witness& input::no_witness() NOEXCEPT
 {
-    static const chain::witness empty_witness{};
-    return empty_witness;
+    static const chain::witness empty{};
+    return empty;
 }
 
 // static/private
 const witness::cptr& input::no_witness_cptr() NOEXCEPT
 {
-    BC_PUSH_WARNING(NO_NEW_OR_DELETE)
-    static const std::shared_ptr<const chain::witness> empty
-    {
-        new const chain::witness{}
-    };
-    BC_POP_WARNING()
+    static const auto empty = std::make_shared<const chain::witness>();
     return empty;
 }
 

src/chain/operation.cpp

@@ -45,32 +45,22 @@ static constexpr auto any_invalid = opcode::op_xor;
 // static/private
 const data_chunk& operation::no_data() NOEXCEPT
 {
-    static const data_chunk empty_data{};
-    return empty_data;
+    static const data_chunk empty{};
+    return empty;
 }
 
 // static/private
 const chunk_cptr& operation::no_data_cptr() NOEXCEPT
 {
-    BC_PUSH_WARNING(NO_NEW_OR_DELETE)
-    static const std::shared_ptr<const data_chunk> empty
-    {
-        new const data_chunk{}
-    };
-    BC_POP_WARNING()
+    static const auto empty = std::make_shared<const data_chunk>();
     return empty;
 }
 
 // static/private
 // Push data is not possible with an invalid code, combination is invalid.
 const chunk_cptr& operation::any_data_cptr() NOEXCEPT
 {
-    BC_PUSH_WARNING(NO_NEW_OR_DELETE)
-    static const std::shared_ptr<const data_chunk> any
-    {
-        new const data_chunk{ 0x42 }
-    };
-    BC_POP_WARNING()
+    static const auto any = to_shared(data_chunk{ 0x42 });
     return any;
 }
 

src/crypto/pseudo_random.cpp

@@ -30,7 +30,6 @@ namespace libbitcoin {
 namespace system {
 
 BC_PUSH_WARNING(NO_STATIC_CAST)
-BC_PUSH_WARNING(NO_NEW_OR_DELETE)
 BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
 BC_PUSH_WARNING(NO_CASTS_FOR_ARITHMETIC_CONVERSION)
 
@@ -104,7 +103,6 @@ steady_clock::duration pseudo_random::duration(
 BC_POP_WARNING()
 BC_POP_WARNING()
 BC_POP_WARNING()
-BC_POP_WARNING()
 
 } // namespace system
 } // namespace libbitcoin