Add confirmation integrity error differentiation.

Author: evoskuil

include/bitcoin/database/error.hpp

@@ -37,6 +37,10 @@ enum error_t : uint8_t
     success,
     unknown_state,
     integrity,
+    integrity1,
+    integrity2,
+    integrity3,
+    integrity4,
 
     /// memory map
     open_open,
@@ -87,10 +91,9 @@ enum error_t : uint8_t
 
     /// validation/confirmation
     tx_connected,
-    tx_preconnected,
     tx_disconnected,
-    block_confirmable,
     block_valid,
+    block_confirmable,
     block_unconfirmable,
     unassociated,
     unvalidated,

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

@@ -285,7 +285,7 @@ error::error_t CLASS::spent_prevout(const point_link& link, index index,
     // Iterate points by point hash (of output tx) because may be conflicts.
     auto point = store_.point.it(get_point_key(link));
     if (!point)
-        return error::integrity;
+        return error::integrity1;
 
     do
     {
@@ -298,7 +298,7 @@ error::error_t CLASS::spent_prevout(const point_link& link, index index,
         do
         {
             if (!store_.spend.get(it, spend))
-                return error::integrity;
+                return error::integrity2;
 
             // is_strong_tx (search) only called in the case of duplicate.
             // Other parent tx of spend is strong (confirmed spent prevout).
@@ -359,7 +359,7 @@ error::error_t CLASS::unspendable_prevout(uint32_t sequence, bool coinbase,
 
     context out{};
     if (!get_context(out, block))
-        return error::integrity;
+        return error::integrity3;
 
     // All txs with same hash must be coinbase or not.
     if (coinbase && !transaction::is_coinbase_mature(out.height, ctx.height))
@@ -533,7 +533,7 @@ code CLASS::block_confirmable(const header_link& link) const NOEXCEPT
 {
     context ctx{};
     if (!get_context(ctx, link))
-        return error::integrity;
+        return error::integrity4;
 
     // This is never invoked (bip30).
     code ec{};

src/error.cpp

@@ -30,6 +30,10 @@ 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" },
@@ -79,10 +83,9 @@ DEFINE_ERROR_T_MESSAGE_MAP(error)
 
     // states
     { tx_connected, "transaction connected" },
-    { tx_preconnected, "transaction preconnected" },
     { tx_disconnected, "transaction disconnected" },
-    { block_confirmable, "block confirmable" },
     { block_valid, "block valid" },
+    { block_confirmable, "block confirmable" },
     { block_unconfirmable, "block unconfirmable" },
     { unassociated, "unassociated" },
     { unvalidated, "unvalidated" },

test/error.cpp

@@ -365,15 +365,6 @@ BOOST_AUTO_TEST_CASE(error_t__code__tx_connected__true_exected_message)
     BOOST_REQUIRE_EQUAL(ec.message(), "transaction connected");
 }
 
-BOOST_AUTO_TEST_CASE(error_t__code__tx_preconnected__true_exected_message)
-{
-    constexpr auto value = error::tx_preconnected;
-    const auto ec = code(value);
-    BOOST_REQUIRE(ec);
-    BOOST_REQUIRE(ec == value);
-    BOOST_REQUIRE_EQUAL(ec.message(), "transaction preconnected");
-}
-
 BOOST_AUTO_TEST_CASE(error_t__code__tx_disconnected__true_exected_message)
 {
     constexpr auto value = error::tx_disconnected;
@@ -383,22 +374,22 @@ BOOST_AUTO_TEST_CASE(error_t__code__tx_disconnected__true_exected_message)
     BOOST_REQUIRE_EQUAL(ec.message(), "transaction disconnected");
 }
 
-BOOST_AUTO_TEST_CASE(error_t__code__block_confirmable__true_exected_message)
+BOOST_AUTO_TEST_CASE(error_t__code__block_valid__true_exected_message)
 {
-    constexpr auto value = error::block_confirmable;
+    constexpr auto value = error::block_valid;
     const auto ec = code(value);
     BOOST_REQUIRE(ec);
     BOOST_REQUIRE(ec == value);
-    BOOST_REQUIRE_EQUAL(ec.message(), "block confirmable");
+    BOOST_REQUIRE_EQUAL(ec.message(), "block valid");
 }
 
-BOOST_AUTO_TEST_CASE(error_t__code__block_valid__true_exected_message)
+BOOST_AUTO_TEST_CASE(error_t__code__block_confirmable__true_exected_message)
 {
-    constexpr auto value = error::block_valid;
+    constexpr auto value = error::block_confirmable;
     const auto ec = code(value);
     BOOST_REQUIRE(ec);
     BOOST_REQUIRE(ec == value);
-    BOOST_REQUIRE_EQUAL(ec.message(), "block valid");
+    BOOST_REQUIRE_EQUAL(ec.message(), "block confirmable");
 }
 
 BOOST_AUTO_TEST_CASE(error_t__code__block_unconfirmable__true_exected_message)

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::integrity);
+    BOOST_REQUIRE_EQUAL(query.block_confirmable(2), error::integrity4);
 }
 
 BOOST_AUTO_TEST_CASE(query_confirm__block_confirmable__null_points__success)