Remove Ord and PartialOrd from AbsLockTime and RelLockTime.

Drop the consensus-u32 ordering that incorrectly compared height-based
and time-based locktimes against each other.

Author: 151henry151

src/primitives/absolute_locktime.rs

@@ -2,7 +2,7 @@
 
 //! Absolute Locktimes
 
-use core::{cmp, fmt};
+use core::fmt;
 
 use bitcoin::absolute;
 
@@ -42,7 +42,7 @@ impl std::error::Error for AbsLockTimeError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { None }
 }
 
-/// An absolute locktime that implements `Ord`.
+/// An absolute locktime.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct AbsLockTime(absolute::LockTime);
 
@@ -84,18 +84,6 @@ impl From<AbsLockTime> for absolute::LockTime {
     fn from(lock_time: AbsLockTime) -> Self { lock_time.0 }
 }
 
-impl cmp::PartialOrd for AbsLockTime {
-    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> { Some(self.cmp(other)) }
-}
-
-impl cmp::Ord for AbsLockTime {
-    fn cmp(&self, other: &Self) -> cmp::Ordering {
-        let this = self.0.to_consensus_u32();
-        let that = other.0.to_consensus_u32();
-        this.cmp(&that)
-    }
-}
-
 impl fmt::Display for AbsLockTime {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::Display::fmt(&self.0, f) }
 }

src/primitives/relative_locktime.rs

@@ -2,7 +2,7 @@
 
 //! Relative Locktimes
 
-use core::{cmp, convert, fmt};
+use core::{convert, fmt};
 
 use bitcoin::{relative, Sequence};
 
@@ -30,7 +30,7 @@ impl std::error::Error for RelLockTimeError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { None }
 }
 
-/// A relative locktime which implements `Ord`.
+/// A relative locktime.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct RelLockTime(Sequence);
 
@@ -96,18 +96,6 @@ impl From<RelLockTime> for relative::LockTime {
     fn from(lock_time: RelLockTime) -> Self { lock_time.0.to_relative_lock_time().unwrap() }
 }
 
-impl cmp::PartialOrd for RelLockTime {
-    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> { Some(self.cmp(other)) }
-}
-
-impl cmp::Ord for RelLockTime {
-    fn cmp(&self, other: &Self) -> cmp::Ordering {
-        let this = self.0.to_consensus_u32();
-        let that = other.0.to_consensus_u32();
-        this.cmp(&that)
-    }
-}
-
 impl fmt::Display for RelLockTime {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fmt::Display::fmt(&self.0, f) }
 }