Sort same-kind locktimes by consensus u32 in Terminal::cmp.

Compare After and Older nodes by consensus u32 rather than locktime
Ord, and add a Miniscript ordering regression test.

Author: 151henry151

src/miniscript/display.rs

@@ -10,6 +10,7 @@ use crate::iter::{Tree, TreeLike};
 use crate::miniscript::types::Type;
 use crate::miniscript::Terminal;
 use crate::prelude::sync::Arc;
+use crate::primitives::locktime_consensus_cmp;
 use crate::{Miniscript, MiniscriptKey, ScriptContext};
 
 #[derive(Clone)]
@@ -343,8 +344,12 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Ord for Terminal<Pk, Ctx> {
                         (DisplayNode::ThresholdK(me), DisplayNode::ThresholdK(you)) => me.cmp(&you),
                         (DisplayNode::Key(me), DisplayNode::Key(you)) => me.cmp(you),
                         (DisplayNode::RawKeyHash(me), DisplayNode::RawKeyHash(you)) => me.cmp(you),
-                        (DisplayNode::After(me), DisplayNode::After(you)) => me.cmp(you),
-                        (DisplayNode::Older(me), DisplayNode::Older(you)) => me.cmp(you),
+                        (DisplayNode::After(me), DisplayNode::After(you)) => {
+                            locktime_consensus_cmp(me.to_consensus_u32(), you.to_consensus_u32())
+                        }
+                        (DisplayNode::Older(me), DisplayNode::Older(you)) => {
+                            locktime_consensus_cmp(me.to_consensus_u32(), you.to_consensus_u32())
+                        }
                         (DisplayNode::Sha256(me), DisplayNode::Sha256(you)) => me.cmp(you),
                         (DisplayNode::Hash256(me), DisplayNode::Hash256(you)) => me.cmp(you),
                         (DisplayNode::Ripemd160(me), DisplayNode::Ripemd160(you)) => me.cmp(you),

src/miniscript/mod.rs

@@ -1262,7 +1262,8 @@ mod tests {
     use crate::policy::Liftable;
     use crate::test_utils::{StrKeyTranslator, StrXOnlyKeyTranslator};
     use crate::{
-        hex_script, BareCtx, Error, Legacy, RelLockTime, Satisfier, ToPublicKey, ValidationError,
+        hex_script, AbsLockTime, BareCtx, Error, Legacy, RelLockTime, Satisfier, ToPublicKey,
+        ValidationError,
     };
 
     type Segwitv0Script = Miniscript<bitcoin::PublicKey, Segwitv0>;
@@ -1979,6 +1980,14 @@ mod tests {
         );
     }
 
+    #[test]
+    fn terminal_ord_locktimes_are_consistent() {
+        let a = Miniscript::<String, Segwitv0>::after(AbsLockTime::from_consensus(9).unwrap());
+        let b = Miniscript::<String, Segwitv0>::after(AbsLockTime::from_consensus(10).unwrap());
+        // Matches policy ordering: 9 < 10 under locktime_consensus_cmp
+        assert!(a < b, "after(9) < after(10) under consensus u32 ordering");
+    }
+
     #[test]
     fn template_timelocks() {
         use crate::{AbsLockTime, RelLockTime};