Revert integrity differentiation, don't pass rvalue to it().

Author: evoskuil

include/bitcoin/database/error.hpp

@@ -37,10 +37,6 @@ enum error_t : uint8_t
     success,
     unknown_state,
     integrity,
-    integrity1,
-    integrity2,
-    integrity3,
-    integrity4,
 
     /// memory map
     open_open,

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

@@ -283,22 +283,26 @@ error::error_t CLASS::spent_prevout(const point_link& link, index index,
     // The upside is half the prevout size (read/write/page) and store increase.
 
     // Iterate points by point hash (of output tx) because may be conflicts.
-    auto point = store_.point.it(get_point_key(link));
+    // Search key must be passed as an l-value as it is held by reference.
+    const auto point_sk = get_point_key(link);
+    auto point = store_.point.it(point_sk);
     if (!point)
-        return error::integrity1;
+        return error::integrity;
 
     do
     {
         // Iterate all spends of the point to find double spends.
-        auto it = store_.spend.it(table::spend::compose(point.self(), index));
+        // Search key must be passed as an l-value as it is held by reference.
+        const auto spend_sk = table::spend::compose(point.self(), index);
+        auto it = store_.spend.it(spend_sk);
         if (!it)
             return error::success;
 
         table::spend::get_parent spend{};
         do
         {
             if (!store_.spend.get(it, spend))
-                return error::integrity2;
+                return error::integrity;
 
             // is_strong_tx (search) only called in the case of duplicate.
             // Other parent tx of spend is strong (confirmed spent prevout).
@@ -359,7 +363,7 @@ error::error_t CLASS::unspendable_prevout(uint32_t sequence, bool coinbase,
 
     context out{};
     if (!get_context(out, block))
-        return error::integrity3;
+        return error::integrity;
 
     // All txs with same hash must be coinbase or not.
     if (coinbase && !transaction::is_coinbase_mature(out.height, ctx.height))
@@ -494,12 +498,14 @@ spend_sets CLASS::to_spend_sets(const header_link& link) const NOEXCEPT
     // Coinbase tx does not spend so is not retrieved.
     const auto txs = to_spending_transactions(link);
 
+    // Empty here is normal.
     if (txs.empty())
         return {};
 
     spend_sets sets{ txs.size() };
     const auto to_set = [this](const auto& tx) NOEXCEPT
     {
+        // Empty here implies integrity fault.
         return to_spend_set(tx);
     };
 
@@ -533,13 +539,14 @@ code CLASS::block_confirmable(const header_link& link) const NOEXCEPT
 {
     context ctx{};
     if (!get_context(ctx, link))
-        return error::integrity4;
+        return error::integrity;
 
     // This is never invoked (bip30).
     code ec{};
     if ((ec = unspent_duplicates(link, ctx)))
         return ec;
 
+    // Empty here could imply integrity fault.
     const auto sets = to_spend_sets(link);
     if (sets.empty())
         return ec;
@@ -753,6 +760,8 @@ bool CLASS::initialize(const block& genesis) NOEXCEPT
     BC_ASSERT(!is_initialized());
     BC_ASSERT(is_one(genesis.transactions_ptr()->size()));
 
+    // TODO: add genesis block neutrino head and body when neutrino is enabled.
+
     // ========================================================================
     const auto scope = store_.get_transactor();
 

include/bitcoin/database/query.hpp

@@ -543,13 +543,14 @@ class query
     bool set_filter_head(const header_link& link,
         const hash_digest& head) NOEXCEPT;
 
+// TODO: protected
+    spend_set to_spend_set(const tx_link& link) const NOEXCEPT;
+    spend_sets to_spend_sets(const header_link& link) const NOEXCEPT;
+
 protected:
     /// Translate.
     /// -----------------------------------------------------------------------
 
-    spend_set to_spend_set(const tx_link& link) const NOEXCEPT;
-    spend_sets to_spend_sets(const header_link& link) const NOEXCEPT;
-
     uint32_t to_spend_index(const tx_link& parent_fk,
         const spend_link& input_fk) const NOEXCEPT;
     uint32_t to_output_index(const tx_link& parent_fk,

src/error.cpp

@@ -30,10 +30,6 @@ DEFINE_ERROR_T_MESSAGE_MAP(error)
     { success, "success" },
     { unknown_state, "unknown state" },
     { integrity, "store corrupted" },
-    { integrity1, "store corrupted1" },
-    { integrity2, "store corrupted2" },
-    { integrity3, "store corrupted3" },
-    { integrity4, "store corrupted4" },
 
     // memory map
     { open_open, "opening open file" },

test/query/confirm.cpp

@@ -469,7 +469,7 @@ BOOST_AUTO_TEST_CASE(query_confirm__block_confirmable__bad_link__integrity)
     BOOST_REQUIRE_EQUAL(store.create(events_handler), error::success);
     BOOST_REQUIRE(query.initialize(test::genesis));
     BOOST_REQUIRE(query.set(test::block1, context{ bip68, 1, 0 }, false, false));
-    BOOST_REQUIRE_EQUAL(query.block_confirmable(2), error::integrity4);
+    BOOST_REQUIRE_EQUAL(query.block_confirmable(2), error::integrity);
 }
 
 BOOST_AUTO_TEST_CASE(query_confirm__block_confirmable__null_points__success)