Simplify non-critical block setters by generating height.

Author: evoskuil

include/bitcoin/database/impl/query/archive_write.ipp

@@ -65,11 +65,10 @@ bool CLASS::set(const transaction& tx) NOEXCEPT
 }
 
 TEMPLATE
-bool CLASS::set(const block& block, bool strong, bool bypass,
-    size_t height) NOEXCEPT
+bool CLASS::set(const block& block, bool strong, bool bypass) NOEXCEPT
 {
     // This sets only the txs of a block with header/context already archived.
-    return !set_code(block, strong, bypass, height);
+    return !set_code(block, strong, bypass);
 }
 
 // set transaction
@@ -350,27 +349,30 @@ code CLASS::set_code(header_link& out_fk, const block& block,
 // releases all memory for parts of itself, due to the custom allocator.
 
 TEMPLATE
-code CLASS::set_code(const block& block, bool strong, bool bypass,
-    size_t height) NOEXCEPT
+code CLASS::set_code(const block& block, bool strong, bool bypass) NOEXCEPT
 {
     header_link unused{};
-    return set_code(unused, block, strong, bypass, height);
+    return set_code(unused, block, strong, bypass);
 }
 
 TEMPLATE
 code CLASS::set_code(header_link& out_fk, const block& block, bool strong,
-    bool bypass, size_t height) NOEXCEPT
+    bool bypass) NOEXCEPT
 {
     out_fk = to_header(block.get_hash());
     if (out_fk.is_terminal())
         return error::txs_header;
 
+    size_t height{};
+    if (!get_height(height, out_fk))
+        return error::txs_height;
+
     return set_code(block, out_fk, strong, bypass, height);
 }
 
 TEMPLATE
 code CLASS::set_code(const block& block, const header_link& key,
-    bool strong, bool bypass, size_t /* height */) NOEXCEPT
+    bool strong, bool bypass, size_t height) NOEXCEPT
 {
     using namespace system;
     if (key.is_terminal())

include/bitcoin/database/query.hpp

@@ -413,8 +413,7 @@ class query
     bool set(const block& block, const context& ctx,
         bool milestone, bool strong) NOEXCEPT;
     bool set(const transaction& tx) NOEXCEPT;
-    bool set(const block& block, bool strong, bool bypass,
-        size_t height) NOEXCEPT;
+    bool set(const block& block, bool strong, bool bypass) NOEXCEPT;
 
     /// Set transaction.
     code set_code(const transaction& tx) NOEXCEPT;
@@ -440,10 +439,9 @@ class query
         const chain_context& ctx, bool milestone, bool strong) NOEXCEPT;
 
     /// Set block.txs (headers-first).
-    code set_code(const block& block, bool strong, bool bypass,
-        size_t height) NOEXCEPT;
+    code set_code(const block& block, bool strong, bool bypass) NOEXCEPT;
     code set_code(header_link& out_fk, const block& block, bool strong,
-        bool bypass, size_t height) NOEXCEPT;
+        bool bypass) NOEXCEPT;
     code set_code(const block& block, const header_link& key, bool strong,
         bool bypass, size_t height) NOEXCEPT;
 

test/query/archive_write.cpp

@@ -705,7 +705,7 @@ BOOST_AUTO_TEST_CASE(query_archive_write__set_block_txs__get_block__expected)
     BOOST_REQUIRE(!query.is_block(test::genesis.hash()));
     BOOST_REQUIRE(query.set(test::genesis.header(), test::context, milestone));
     BOOST_REQUIRE(!query.is_associated(0));
-    BOOST_REQUIRE(query.set(test::genesis, false, false, zero));
+    BOOST_REQUIRE(query.set(test::genesis, false, false));
     BOOST_REQUIRE(query.is_block(test::genesis.hash()));
     BOOST_REQUIRE(query.is_associated(0));
 

test/query/initialize.cpp

@@ -415,17 +415,17 @@ BOOST_AUTO_TEST_CASE(query_initialize__get_unassociated_above__gapped_candidate_
     BOOST_REQUIRE_EQUAL(unassociated3.size(), 0u);
 
     // There are two unassociated blocks above block 1 (new fork point).
-    BOOST_REQUIRE(query.set(test::block1, false, false, zero));
+    BOOST_REQUIRE(query.set(test::block1, false, false));
     BOOST_REQUIRE(query.push_confirmed(query.to_header(test::block1.hash()), false));
     BOOST_REQUIRE_EQUAL(query.get_all_unassociated().size(), 2u);
 
     // There is one unassociated block above block 2 (new fork point).
-    BOOST_REQUIRE(query.set(test::block2, false, false, zero));
+    BOOST_REQUIRE(query.set(test::block2, false, false));
     BOOST_REQUIRE(query.push_confirmed(query.to_header(test::block2.hash()), false));
     BOOST_REQUIRE_EQUAL(query.get_all_unassociated().size(), 1u);
 
     // There are no unassociated blocks above block 3 (new fork point).
-    BOOST_REQUIRE(query.set(test::block3, false, false, zero));
+    BOOST_REQUIRE(query.set(test::block3, false, false));
     BOOST_REQUIRE(query.push_confirmed(query.to_header(test::block3.hash()), false));
     BOOST_REQUIRE_EQUAL(query.get_all_unassociated().size(), 0u);
 }
@@ -482,15 +482,15 @@ BOOST_AUTO_TEST_CASE(query_initialize__get_unassociated_count_above__gapped_cand
     BOOST_REQUIRE_EQUAL(query.get_unassociated_count_above(3, 1), 0u);
 
     // There is one unassociated block at block 2.
-    BOOST_REQUIRE(query.set(test::block3, false, false, zero));             // associated
+    BOOST_REQUIRE(query.set(test::block3, false, false));             // associated
     BOOST_REQUIRE_EQUAL(query.get_unassociated_count(), 1u);
     BOOST_REQUIRE_EQUAL(query.get_unassociated_count_above(0), 1u);
     BOOST_REQUIRE_EQUAL(query.get_unassociated_count_above(1), 1u);
     BOOST_REQUIRE_EQUAL(query.get_unassociated_count_above(2), 0u);
     BOOST_REQUIRE_EQUAL(query.get_unassociated_count_above(3), 0u);
 
     // There are no unassociated blocks.
-    BOOST_REQUIRE(query.set(test::block2, false, false, zero));             // associated
+    BOOST_REQUIRE(query.set(test::block2, false, false));             // associated
     BOOST_REQUIRE_EQUAL(query.get_unassociated_count(), 0u);
     BOOST_REQUIRE_EQUAL(query.get_unassociated_count_above(0), 0u);
     BOOST_REQUIRE_EQUAL(query.get_unassociated_count_above(1), 0u);