Merge pull request #1644 from evoskuil/master

Remove error::block_malleated code.

Author: evoskuil

include/bitcoin/system/error/block_error_t.hpp

@@ -56,7 +56,6 @@ enum block_error_t : uint8_t
     forward_reference,
     invalid_transaction_commitment,
     block_legacy_sigop_limit,
-    block_malleated,
 
     // accept block
     block_non_final,

src/chain/block.cpp

@@ -853,16 +853,10 @@ code block::confirm_transactions(const context& ctx) const NOEXCEPT
 
 // Identity.
 // ----------------------------------------------------------------------------
-// invalid_transaction_commitment, invalid_witness_commitment, block_malleated
-// codes specifically indicate lack of block hash tx identification (identity).
 
 code block::identify() const NOEXCEPT
 {
-    // type64 malleated is a subset of first_not_coinbase.
-    // type32 malleated is a subset of is_internal_double_spend.
-    if (is_malleated())
-        return error::block_malleated;
-    if (is_invalid_merkle_root())
+    if (is_malleated() || is_invalid_merkle_root())
         return error::invalid_transaction_commitment;
 
     return error::block_success;

src/error/block_error_t.cpp

@@ -52,7 +52,6 @@ DEFINE_ERROR_T_MESSAGE_MAP(block_error)
     { forward_reference, "transactions out of order" },
     { invalid_transaction_commitment, "invalid transaction commitment" },
     { block_legacy_sigop_limit, "too many block legacy signature operations" },
-    { block_malleated, "block is malleated" },
 
     // accept block
     { block_non_final, "block contains a non-final transaction" },

test/error/block_error_t.cpp

@@ -183,15 +183,6 @@ BOOST_AUTO_TEST_CASE(block_error_t__code__block_legacy_sigop_limit__true_exected
     BOOST_REQUIRE_EQUAL(ec.message(), "too many block legacy signature operations");
 }
 
-BOOST_AUTO_TEST_CASE(block_error_t__code__block_malleated__true_exected_message)
-{
-    constexpr auto value = error::block_malleated;
-    const auto ec = code(value);
-    BOOST_REQUIRE(ec);
-    BOOST_REQUIRE(ec == value);
-    BOOST_REQUIRE_EQUAL(ec.message(), "block is malleated");
-}
-
 // accept block
 
 BOOST_AUTO_TEST_CASE(block_error_t__code__block_non_final__true_exected_message)