Skip to content

Commit

Permalink
Merge pull request #1431 from evoskuil/master
Browse files Browse the repository at this point in the history
Revert "Auxiliary commit to revert individual files from 7bfd5a7
  • Loading branch information
evoskuil authored Mar 29, 2024
2 parents 7ea88d8 + 30d1c2b commit 1e0f600
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 11 deletions.
1 change: 0 additions & 1 deletion include/bitcoin/system/error/block_error_t.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ enum block_error_t : uint8_t
forward_reference,
merkle_mismatch,
block_legacy_sigop_limit,
malleable_identifier,

// accept block
block_non_final,
Expand Down
1 change: 0 additions & 1 deletion src/error/block_error_t.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ DEFINE_ERROR_T_MESSAGE_MAP(block_error)
{ forward_reference, "transactions out of order" },
{ merkle_mismatch, "merkle root mismatch" },
{ block_legacy_sigop_limit, "too many block legacy signature operations" },
{ malleable_identifier, "block identifier is malleable" },

// accept block
{ block_non_final, "block contains a non-final transaction" },
Expand Down
9 changes: 0 additions & 9 deletions test/error/block_error_t.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -172,15 +172,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__malleable_identifier__true_exected_message)
{
constexpr auto value = error::malleable_identifier;
const auto ec = code(value);
BOOST_REQUIRE(ec);
BOOST_REQUIRE(ec == value);
BOOST_REQUIRE_EQUAL(ec.message(), "block identifier is malleable");
}

// accept block

BOOST_AUTO_TEST_CASE(block_error_t__code__block_non_final__true_exected_message)
Expand Down

0 comments on commit 1e0f600

Please sign in to comment.