Merge pull request #732 from evoskuil/master

Ensure that all consensus results are system::error codes.

Author: evoskuil

include/bitcoin/database/error.hpp

@@ -111,14 +111,6 @@ enum error_t : uint8_t
     unvalidated,
     bypassed,
 
-    /// confirmation (require not just context but prevouts and/or metadata).
-    missing_previous_output,
-    coinbase_maturity,
-    unspent_coinbase_collision,
-    relative_time_locked,
-    unconfirmed_spend,
-    confirmed_double_spend,
-
     /// tx archive
     tx_empty,
     tx_tx_allocate,

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

@@ -25,6 +25,9 @@
 #include <bitcoin/database/define.hpp>
 #include <bitcoin/database/error.hpp>
 
+// Consensus error codes must be system::error category in order for the node
+// to properly categorize the result.
+
 namespace libbitcoin {
 namespace database {
 
@@ -167,7 +170,7 @@ code CLASS::unspent_duplicates(const header_link& link,
     // bip30: all outputs of all previous duplicate coinbases must be spent.
     for (const auto& cb: coinbases)
         if (!is_spent_coinbase(cb))
-            return error::unspent_coinbase_collision;
+            return system::error::unspent_coinbase_collision;
 
     return error::success;
 }
@@ -193,7 +196,7 @@ code CLASS::unspendable(uint32_t sequence, bool coinbase,
     // Unassociated to block is rare, generally implies a duplicate tx.
     // Not strong (in any block) implies the spend is not confirmed.
     if (strong.is_terminal() && !is_strong(tx))
-        return error::unconfirmed_spend;
+        return system::error::unconfirmed_spend;
 
     const auto relative = ctx.is_enabled(system::chain::flags::bip68_rule) &&
         transaction::is_relative_locktime_applied(coinbase, version, sequence);
@@ -207,11 +210,11 @@ code CLASS::unspendable(uint32_t sequence, bool coinbase,
         if (relative &&
             input::is_relative_locked(sequence, ctx.height, ctx.mtp,
                 out.height, out.mtp))
-            return error::relative_time_locked;
+            return system::error::relative_time_locked;
 
         if (coinbase &&
             !transaction::is_coinbase_mature(out.height, ctx.height))
-            return error::coinbase_maturity;
+            return system::error::coinbase_maturity;
     }
 
     return error::success;
@@ -260,7 +263,7 @@ code CLASS::populate_prevouts(point_sets& sets, size_t points,
     // Is any duplicated point in the block confirmed (generally empty).
     for (const auto& spender: cache.conflicts)
         if (is_strong_tx(spender))
-            return error::confirmed_double_spend;
+            return system::error::confirmed_double_spend;
 
     // Augment spend.points with metadata.
     auto it = cache.spends.begin();

src/error.cpp

@@ -104,14 +104,6 @@ DEFINE_ERROR_T_MESSAGE_MAP(error)
     { unvalidated, "unvalidated" },
     { bypassed, "bypassed" },
 
-    // states
-    { missing_previous_output, "missing previous output" },
-    { coinbase_maturity, "coinbase maturity" },
-    { unspent_coinbase_collision, "unspent coinbase collision" },
-    { relative_time_locked, "relative time locked" },
-    { unconfirmed_spend, "unconfirmed spend" },
-    { confirmed_double_spend, "confirmed double spend" },
-
     // tx archive
     { tx_empty, "tx_empty" },
     { tx_tx_allocate, "tx_tx_allocate" },

test/error.cpp

@@ -473,60 +473,6 @@ BOOST_AUTO_TEST_CASE(error_t__code__bypassed__true_expected_message)
     BOOST_REQUIRE_EQUAL(ec.message(), "bypassed");
 }
 
-BOOST_AUTO_TEST_CASE(error_t__code__missing_previous_output__true_expected_message)
-{
-    constexpr auto value = error::missing_previous_output;
-    const auto ec = code(value);
-    BOOST_REQUIRE(ec);
-    BOOST_REQUIRE(ec == value);
-    BOOST_REQUIRE_EQUAL(ec.message(), "missing previous output");
-}
-
-BOOST_AUTO_TEST_CASE(error_t__code__coinbase_maturity__true_expected_message)
-{
-    constexpr auto value = error::coinbase_maturity;
-    const auto ec = code(value);
-    BOOST_REQUIRE(ec);
-    BOOST_REQUIRE(ec == value);
-    BOOST_REQUIRE_EQUAL(ec.message(), "coinbase maturity");
-}
-
-BOOST_AUTO_TEST_CASE(error_t__code__unspent_coinbase_collision__true_expected_message)
-{
-    constexpr auto value = error::unspent_coinbase_collision;
-    const auto ec = code(value);
-    BOOST_REQUIRE(ec);
-    BOOST_REQUIRE(ec == value);
-    BOOST_REQUIRE_EQUAL(ec.message(), "unspent coinbase collision");
-}
-
-BOOST_AUTO_TEST_CASE(error_t__code__relative_time_locked__true_expected_message)
-{
-    constexpr auto value = error::relative_time_locked;
-    const auto ec = code(value);
-    BOOST_REQUIRE(ec);
-    BOOST_REQUIRE(ec == value);
-    BOOST_REQUIRE_EQUAL(ec.message(), "relative time locked");
-}
-
-BOOST_AUTO_TEST_CASE(error_t__code__unconfirmed_spend__true_expected_message)
-{
-    constexpr auto value = error::unconfirmed_spend;
-    const auto ec = code(value);
-    BOOST_REQUIRE(ec);
-    BOOST_REQUIRE(ec == value);
-    BOOST_REQUIRE_EQUAL(ec.message(), "unconfirmed spend");
-}
-
-BOOST_AUTO_TEST_CASE(error_t__code__confirmed_double_spend__true_expected_message)
-{
-    constexpr auto value = error::confirmed_double_spend;
-    const auto ec = code(value);
-    BOOST_REQUIRE(ec);
-    BOOST_REQUIRE(ec == value);
-    BOOST_REQUIRE_EQUAL(ec.message(), "confirmed double spend");
-}
-
 // tx archive
 
 BOOST_AUTO_TEST_CASE(error_t__code__tx_empty__true_expected_message)