Merge pull request #1514 from nuttycom/fix/remove_blockheight_addition

zcash_protocol: Remove impl {Add, Sub} for BlockHeight
zcash · Aug 26, 2024 · 21399ec · 21399ec
2 parents dbc77df + 8259825
commit 21399ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/components/zcash_protocol/CHANGELOG.md b/components/zcash_protocol/CHANGELOG.md
@@ -7,6 +7,10 @@ and this library adheres to Rust's notion of
 
 ## [Unreleased]
 
+### Removed
+- `impl {Add, Sub} for BlockHeight` - these operations were unused, and block
+  heights are a vector space, not a monoid.
+
 ## [0.2.0] - 2024-08-19
 ### Added
 - `zcash_protocol::PoolType::{TRANSPARENT, SAPLING, ORCHARD}`

diff --git a/components/zcash_protocol/src/consensus.rs b/components/zcash_protocol/src/consensus.rs
@@ -107,14 +107,6 @@ impl Add<u32> for BlockHeight {
     }
 }
 
-impl Add for BlockHeight {
-    type Output = Self;
-
-    fn add(self, other: Self) -> Self {
-        self + other.0
-    }
-}
-
 impl Sub<u32> for BlockHeight {
     type Output = Self;
 
@@ -127,14 +119,6 @@ impl Sub<u32> for BlockHeight {
     }
 }
 
-impl Sub for BlockHeight {
-    type Output = Self;
-
-    fn sub(self, other: Self) -> Self {
-        self - other.0
-    }
-}
-
 /// Constants associated with a given Zcash network.
 pub trait NetworkConstants: Clone {
     /// The coin type for ZEC, as defined by [SLIP 44].