From 9a9b41008f72cb8a00cfed2890d839aea2ea27c7 Mon Sep 17 00:00:00 2001
From: "Tobin C. Harding" <me@tobin.cc>
Date: Wed, 14 May 2025 14:56:28 +1000
Subject: [PATCH] units: Make block-related types have private inner fields

We recently added a bunch of types in the `block` module that are
wrappers around `u32`. When we did we slapped `pub` on the inner fields.

Lets be more mindful and make the inner fields private. Note all these
types have `to_u32`, `from_u32` and `From` in both directions.
---
 units/src/block.rs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/units/src/block.rs b/units/src/block.rs
index 83770a5fa..4efe0547b 100644
--- a/units/src/block.rs
+++ b/units/src/block.rs
@@ -85,8 +85,7 @@ impl_u32_wrapper! {
     /// This is a thin wrapper around a `u32` that may take on all values of a `u32`.
     #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    // Public to try and make it really clear that there are no invariants.
-    pub struct BlockHeight(pub u32);
+    pub struct BlockHeight(u32);
 }
 
 impl BlockHeight {
@@ -130,8 +129,7 @@ impl_u32_wrapper! {
     /// purpose block interval abstraction. For locktimes please see [`locktime::relative::Height`].
     #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    // Public to try and make it really clear that there are no invariants.
-    pub struct BlockHeightInterval(pub u32);
+    pub struct BlockHeightInterval(u32);
 }
 
 impl BlockHeightInterval {
@@ -173,8 +171,7 @@ impl_u32_wrapper! {
     /// This is a thin wrapper around a `u32` that may take on all values of a `u32`.
     #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    // Public to try and make it really clear that there are no invariants.
-    pub struct BlockMtp(pub u32);
+    pub struct BlockMtp(u32);
 }
 
 impl BlockMtp {
@@ -228,8 +225,7 @@ impl_u32_wrapper! {
     /// This is a thin wrapper around a `u32` that may take on all values of a `u32`.
     #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
     #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-    // Public to try and make it really clear that there are no invariants.
-    pub struct BlockMtpInterval(pub u32);
+    pub struct BlockMtpInterval(u32);
 }
 
 impl BlockMtpInterval {