Restore redundant variant types.

libbitcoin · Jun 27, 2024 · 77112a4 · 77112a4
1 parent 71bf33a
commit 77112a4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 20 deletions.
diff --git a/include/bitcoin/node/define.hpp b/include/bitcoin/node/define.hpp
@@ -72,14 +72,8 @@ using count_t = size_t;
 using height_t = size_t;
 using channel_t = uint64_t;
 using object_t = object_key;
-
-// HACK: xcode sees header_t unique from uint32_t if defined from links.
-// HACK: but clag/gcc/msvc do not, so is a conflict there to add it.
-using header_t = uint32_t;
-using transaction_t = uint32_t;
-static_assert(sizeof(header_t) == sizeof(database::header_link::integer));
-static_assert(sizeof(transaction_t) == sizeof(database::tx_link::integer));
-
+using header_t = database::header_link::integer;
+using transaction_t = database::tx_link::integer;
 typedef system::chain::block::cptr block_t;
 ////typedef struct
 ////{

diff --git a/include/bitcoin/node/impl/chasers/chaser_organize.ipp b/include/bitcoin/node/impl/chasers/chaser_organize.ipp
@@ -95,18 +95,16 @@ bool CLASS::handle_event(const code&, chase event_, event_value value) NOEXCEPT
         case chase::unvalid:
         case chase::unconfirmable:
         {
-            // HACK: header_t
             // Roll back the candidate chain to confirmed top (via fork point).
-            BC_ASSERT(std::holds_alternative<uint32_t>(value));
-            POST(do_disorganize, std::get<uint32_t>(value));
+            BC_ASSERT(std::holds_alternative<header_t>(value));
+            POST(do_disorganize, std::get<header_t>(value));
             break;
         }
         case chase::malleated:
         {
-            // HACK: header_t
             // Re-obtain the malleated block if it is still a candidate (virtual).
-            BC_ASSERT(std::holds_alternative<uint32_t>(value));
-            POST(do_malleated, std::get<uint32_t>(value));
+            BC_ASSERT(std::holds_alternative<header_t>(value));
+            POST(do_malleated, std::get<header_t>(value));
             break;
         }
         case chase::stop:

diff --git a/src/chasers/chaser_check.cpp b/src/chasers/chaser_check.cpp
@@ -126,9 +126,8 @@ bool chaser_check::handle_event(const code&, chase event_,
         // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
         case chase::header:
         {
-            // HACK: header_t
-            BC_ASSERT(std::holds_alternative<uint32_t>(value));
-            POST(do_header, std::get<uint32_t>(value));
+            BC_ASSERT(std::holds_alternative<header_t>(value));
+            POST(do_header, std::get<header_t>(value));
             break;
         }
         case chase::headers:

diff --git a/src/chasers/chaser_template.cpp b/src/chasers/chaser_template.cpp
@@ -62,9 +62,8 @@ bool chaser_template::handle_event(const code&, chase event_,
     {
         case chase::transaction:
         {
-            // HACK: transaction_t
-            BC_ASSERT(std::holds_alternative<uint32_t>(value));
-            POST(do_transaction, std::get<uint32_t>(value));
+            BC_ASSERT(std::holds_alternative<transaction_t>(value));
+            POST(do_transaction, std::get<transaction_t>(value));
             break;
         }
         case chase::stop: