Use impl_op_for_references for block height/interval

tcharding · tcharding · commit 9d5592295297 · 2025-03-03T13:11:19.000+11:00
We have a new macro for implementing ops with a bunch of reference
combos. Lets use it for block `Height` and `Interval`.

This patch is strictly additive.
diff --git a/units/src/block.rs b/units/src/block.rs
@@ -171,53 +171,55 @@ impl fmt::Display for TooBigForRelativeBlockHeightError {
 #[cfg(feature = "std")]
 impl std::error::Error for TooBigForRelativeBlockHeightError {}
 
-// height - height = interval
-impl ops::Sub<BlockHeight> for BlockHeight {
-    type Output = BlockInterval;
-
-    fn sub(self, rhs: BlockHeight) -> Self::Output {
-        let interval = self.to_u32() - rhs.to_u32();
-        BlockInterval::from_u32(interval)
+crate::internal_macros::impl_op_for_references! {
+    // height - height = interval
+    impl ops::Sub<BlockHeight> for BlockHeight {
+        type Output = BlockInterval;
+
+        fn sub(self, rhs: BlockHeight) -> Self::Output {
+            let interval = self.to_u32() - rhs.to_u32();
+            BlockInterval::from_u32(interval)
+        }
     }
-}
 
-// height + interval = height
-impl ops::Add<BlockInterval> for BlockHeight {
-    type Output = BlockHeight;
+    // height + interval = height
+    impl ops::Add<BlockInterval> for BlockHeight {
+        type Output = BlockHeight;
 
-    fn add(self, rhs: BlockInterval) -> Self::Output {
-        let height = self.to_u32() + rhs.to_u32();
-        BlockHeight::from_u32(height)
+        fn add(self, rhs: BlockInterval) -> Self::Output {
+            let height = self.to_u32() + rhs.to_u32();
+            BlockHeight::from_u32(height)
+        }
     }
-}
 
-// height - interval = height
-impl ops::Sub<BlockInterval> for BlockHeight {
-    type Output = BlockHeight;
+    // height - interval = height
+    impl ops::Sub<BlockInterval> for BlockHeight {
+        type Output = BlockHeight;
 
-    fn sub(self, rhs: BlockInterval) -> Self::Output {
-        let height = self.to_u32() - rhs.to_u32();
-        BlockHeight::from_u32(height)
+        fn sub(self, rhs: BlockInterval) -> Self::Output {
+            let height = self.to_u32() - rhs.to_u32();
+            BlockHeight::from_u32(height)
+        }
     }
-}
 
-// interval + interval = interval
-impl ops::Add<BlockInterval> for BlockInterval {
-    type Output = BlockInterval;
+    // interval + interval = interval
+    impl ops::Add<BlockInterval> for BlockInterval {
+        type Output = BlockInterval;
 
-    fn add(self, rhs: BlockInterval) -> Self::Output {
-        let height = self.to_u32() + rhs.to_u32();
-        BlockInterval::from_u32(height)
+        fn add(self, rhs: BlockInterval) -> Self::Output {
+            let height = self.to_u32() + rhs.to_u32();
+            BlockInterval::from_u32(height)
+        }
     }
-}
 
-// interval - interval = interval
-impl ops::Sub<BlockInterval> for BlockInterval {
-    type Output = BlockInterval;
+    // interval - interval = interval
+    impl ops::Sub<BlockInterval> for BlockInterval {
+        type Output = BlockInterval;
 
-    fn sub(self, rhs: BlockInterval) -> Self::Output {
-        let height = self.to_u32() - rhs.to_u32();
-        BlockInterval::from_u32(height)
+        fn sub(self, rhs: BlockInterval) -> Self::Output {
+            let height = self.to_u32() - rhs.to_u32();
+            BlockInterval::from_u32(height)
+        }
     }
 }
 
