Merge pull request #1437 from evoskuil/master

Remove dead code.

include/bitcoin/system/chain/chain_state.hpp

@@ -65,21 +65,12 @@ class BC_API chain_state
         /// [block - 1, floor(block - 2016, 0)] mainnet: 1, testnet: 2016|0
         range bits{};
 
-        /// (block - 0), used only for populating bits.ordered on increment.
-        size_t bits_self{};
-
         /// [block - 1, floor(block - 1000, 0)] mainnet: 1000, testnet: 100
         range version{};
 
-        /// (block - 0)
-        size_t version_self{};
-
         /// [block - 1, floor(block - 11, 0)]
         range timestamp{};
 
-        /// (block - 0)
-        size_t timestamp_self{};
-
         /// (block - (block % 2016 == 0 ? 2016 : block % 2016))
         size_t timestamp_retarget{};
 

src/chain/chain_state.cpp

@@ -504,17 +504,14 @@ chain_state::map chain_state::get_map(size_t height,
     map map{};
 
     // The height bound of the reverse (high to low) retarget search.
-    map.bits_self = height;
     map.bits.high = sub1(height);
     map.bits.count = bits_count(height, forks, interval);
 
     // The height bound of the median time past function.
-    map.timestamp_self = height;
     map.timestamp.high = sub1(height);
     map.timestamp.count = timestamp_count(height, forks);
 
     // The height bound of the version sample for activations.
-    map.version_self = height;
     map.version.high = sub1(height);
     map.version.count = version_count(height, forks,
         settings.bip34_activation_sample);