Update fee queries to pull whole object.

Author: evoskuil

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

@@ -124,17 +124,23 @@ code CLASS::get_block_state(const header_link& link) const NOEXCEPT
 }
 
 TEMPLATE
-code CLASS::get_block_state(uint64_t& fees,
-    const header_link& link) const NOEXCEPT
+uint64_t CLASS::get_block_fees(const header_link& link) const NOEXCEPT
 {
-    table::validated_bk::slab valid{};
-    if (!store_.validated_bk.at(to_validated_bk(link), valid))
-        return is_associated(link) ? error::unvalidated : error::unassociated;
+    // TODO: optimize.
+    const auto block = get_block(link, false);
+    return block && populate_without_metadata(*block) ? block->fees() :
+        max_uint64;
+}
 
-    // TODO: Fees only valid if block_valid is the current state (iterate for valid).
-    fees = valid.fees;
+TEMPLATE
+uint64_t CLASS::get_tx_fee(const tx_link& link) const NOEXCEPT
+{
+    // TODO: optimize.
+    const auto tx = get_transaction(link, false);
+    if (is_coinbase(link))
+        return {};
 
-    return to_block_code(valid.code);
+    return tx && populate_without_metadata(*tx) ? tx->fee() : max_uint64;
 }
 
 TEMPLATE

include/bitcoin/database/query.hpp

@@ -473,9 +473,10 @@ class query
     /// -----------------------------------------------------------------------
 
     /// States.
-    code get_header_state(const header_link& link) const NOEXCEPT;
+    uint64_t get_tx_fee(const tx_link& link) const NOEXCEPT;
+    uint64_t get_block_fees(const header_link& link) const NOEXCEPT;
     code get_block_state(const header_link& link) const NOEXCEPT;
-    code get_block_state(uint64_t& fees, const header_link& link) const NOEXCEPT;
+    code get_header_state(const header_link& link) const NOEXCEPT;
     code get_tx_state(const tx_link& link, const context& ctx) const NOEXCEPT;
     code get_tx_state(uint64_t& fee, size_t& sigops, const tx_link& link,
         const context& ctx) const NOEXCEPT;

test/query/validate.cpp

@@ -167,7 +167,6 @@ BOOST_AUTO_TEST_CASE(query_validate__get_block_state__invalid_link__unassociated
     uint64_t fees{};
     BOOST_REQUIRE_EQUAL(query.get_header_state(1), error::unvalidated);
     BOOST_REQUIRE_EQUAL(query.get_block_state(1), error::unassociated);
-    BOOST_REQUIRE_EQUAL(query.get_block_state(fees, 1), error::unassociated);
     BOOST_REQUIRE_EQUAL(fees, 0u);
 }
 
@@ -185,7 +184,6 @@ BOOST_AUTO_TEST_CASE(query_validate__get_block_state__unassociated_link__unassoc
     uint64_t fees{};
     BOOST_REQUIRE_EQUAL(query.get_header_state(1), error::unvalidated);
     BOOST_REQUIRE_EQUAL(query.get_block_state(1), error::unassociated);
-    BOOST_REQUIRE_EQUAL(query.get_block_state(fees, 1), error::unassociated);
     BOOST_REQUIRE_EQUAL(fees, 0u);
 }
 
@@ -202,7 +200,6 @@ BOOST_AUTO_TEST_CASE(query_validate__get_block_state__unvalidated_link__unvalida
     uint64_t fees{};
     BOOST_REQUIRE_EQUAL(query.get_header_state(1), error::unvalidated);
     BOOST_REQUIRE_EQUAL(query.get_block_state(1), error::unvalidated);
-    BOOST_REQUIRE_EQUAL(query.get_block_state(fees, 1), error::unvalidated);
     BOOST_REQUIRE_EQUAL(fees, 0u);
 }
 
@@ -219,13 +216,11 @@ BOOST_AUTO_TEST_CASE(query_validate__get_block_state__confirmable__block_confirm
     uint64_t fees{};
     BOOST_REQUIRE_EQUAL(query.get_header_state(0), error::unvalidated);
     BOOST_REQUIRE_EQUAL(query.get_block_state(0), error::unvalidated);
-    BOOST_REQUIRE_EQUAL(query.get_block_state(fees, 0), error::unvalidated);
     BOOST_REQUIRE_EQUAL(fees, 0u);
 
     BOOST_REQUIRE(query.set_block_confirmable(1));
     BOOST_REQUIRE_EQUAL(query.get_header_state(1), error::block_confirmable);
     BOOST_REQUIRE_EQUAL(query.get_block_state(1), error::block_confirmable);
-    BOOST_REQUIRE_EQUAL(query.get_block_state(fees, 1), error::block_confirmable);
     BOOST_REQUIRE_EQUAL(fees, 0u);
 }
 
@@ -239,12 +234,9 @@ BOOST_AUTO_TEST_CASE(query_validate__get_block_state__valid__block_valid)
     BOOST_REQUIRE(query.initialize(test::genesis));
     BOOST_REQUIRE(query.set(test::block1, context{}, false, false));
 
-    uint64_t fees{};
     BOOST_REQUIRE(query.set_block_valid(1, 42));
     BOOST_REQUIRE_EQUAL(query.get_header_state(1), error::block_valid);
     BOOST_REQUIRE_EQUAL(query.get_block_state(1), error::block_valid);
-    BOOST_REQUIRE_EQUAL(query.get_block_state(fees, 1), error::block_valid);
-    BOOST_REQUIRE_EQUAL(fees, 42u);
 }
 
 BOOST_AUTO_TEST_CASE(query_validate__get_block_state__unconfirmable__block_unconfirmable)
@@ -257,12 +249,9 @@ BOOST_AUTO_TEST_CASE(query_validate__get_block_state__unconfirmable__block_uncon
     BOOST_REQUIRE(query.initialize(test::genesis));
     BOOST_REQUIRE(query.set(test::block1, context{}, false, false));
 
-    uint64_t fees{};
     BOOST_REQUIRE(query.set_block_unconfirmable(1));
     BOOST_REQUIRE_EQUAL(query.get_header_state(1), error::block_unconfirmable);
     BOOST_REQUIRE_EQUAL(query.get_block_state(1), error::block_unconfirmable);
-    BOOST_REQUIRE_EQUAL(query.get_block_state(fees, 1), error::block_unconfirmable);
-    BOOST_REQUIRE_EQUAL(fees, 0u);
 }
 
 BOOST_AUTO_TEST_CASE(query_validate__get_tx_state__invalid_link__unvalidated)