miniscript: use RelLockTime in Satisfaction

Gets rid of a couple unwraps from the last commit :)

Author: apoelstra

src/descriptor/mod.rs

@@ -512,10 +512,7 @@ impl Descriptor<DefiniteDescriptorKey> {
                 descriptor: self,
                 template: stack,
                 absolute_timelock: satisfaction.absolute_timelock.map(Into::into),
-                // unwrap to be removed in a later commit
-                relative_timelock: satisfaction
-                    .relative_timelock
-                    .map(|s| s.to_relative_lock_time().unwrap()),
+                relative_timelock: satisfaction.relative_timelock.map(Into::into),
             })
         } else {
             Err(self)
@@ -544,9 +541,7 @@ impl Descriptor<DefiniteDescriptorKey> {
                 template: stack,
                 absolute_timelock: satisfaction.absolute_timelock.map(Into::into),
                 // unwrap to be removed in a later commit
-                relative_timelock: satisfaction
-                    .relative_timelock
-                    .map(|s| s.to_relative_lock_time().unwrap()),
+                relative_timelock: satisfaction.relative_timelock.map(Into::into),
             })
         } else {
             Err(self)

src/miniscript/mod.rs

@@ -1355,7 +1355,7 @@ mod tests {
 
     #[test]
     fn template_timelocks() {
-        use crate::AbsLockTime;
+        use crate::{AbsLockTime, RelLockTime};
         let key_present = bitcoin::PublicKey::from_str(
             "0327a6ed0e71b451c79327aa9e4a6bb26ffb1c0056abc02c25e783f6096b79bb4f",
         )
@@ -1381,28 +1381,28 @@ mod tests {
             (
                 format!("or_d(pk({}),and_v(v:pk({}),older(12960)))", key_missing, key_present),
                 None,
-                Some(bitcoin::Sequence(12960)),
+                Some(RelLockTime::from_height(12960)),
             ),
             (
                 format!(
                     "thresh(3,pk({}),s:pk({}),snl:older(10),snl:after(11))",
                     key_present, key_missing
                 ),
                 Some(AbsLockTime::from_consensus(11).unwrap()),
-                Some(bitcoin::Sequence(10)),
+                Some(RelLockTime::from_height(10)),
             ),
             (
                 format!("and_v(v:and_v(v:pk({}),older(10)),older(20))", key_present),
                 None,
-                Some(bitcoin::Sequence(20)),
+                Some(RelLockTime::from_height(20)),
             ),
             (
                 format!(
                     "andor(pk({}),older(10),and_v(v:pk({}),older(20)))",
                     key_present, key_missing
                 ),
                 None,
-                Some(bitcoin::Sequence(10)),
+                Some(RelLockTime::from_height(10)),
             ),
         ];
 

src/miniscript/satisfy.rs

@@ -18,7 +18,9 @@ use super::context::SigType;
 use crate::plan::AssetProvider;
 use crate::prelude::*;
 use crate::util::witness_size;
-use crate::{AbsLockTime, Miniscript, MiniscriptKey, ScriptContext, Terminal, ToPublicKey};
+use crate::{
+    AbsLockTime, Miniscript, MiniscriptKey, RelLockTime, ScriptContext, Terminal, ToPublicKey,
+};
 
 /// Type alias for 32 byte Preimage.
 pub type Preimage32 = [u8; 32];
@@ -117,6 +119,12 @@ impl<Pk: MiniscriptKey + ToPublicKey> Satisfier<Pk> for Sequence {
     }
 }
 
+impl<Pk: MiniscriptKey + ToPublicKey> Satisfier<Pk> for RelLockTime {
+    fn check_older(&self, n: relative::LockTime) -> bool {
+        <relative::LockTime as Satisfier<Pk>>::check_older(&(*self).into(), n)
+    }
+}
+
 impl<Pk: MiniscriptKey + ToPublicKey> Satisfier<Pk> for relative::LockTime {
     fn check_older(&self, n: relative::LockTime) -> bool { n.is_implied_by(*self) }
 }
@@ -876,7 +884,7 @@ pub struct Satisfaction<T> {
     /// The absolute timelock used by this satisfaction
     pub absolute_timelock: Option<AbsLockTime>,
     /// The relative timelock used by this satisfaction
-    pub relative_timelock: Option<Sequence>,
+    pub relative_timelock: Option<RelLockTime>,
 }
 
 impl<Pk: MiniscriptKey + ToPublicKey> Satisfaction<Placeholder<Pk>> {
@@ -1278,19 +1286,19 @@ impl<Pk: MiniscriptKey + ToPublicKey> Satisfaction<Placeholder<Pk>> {
             }
             Terminal::Older(t) => {
                 // unwrap to be removed in a later commit
-                let (stack, relative_timelock) =
-                    if stfr.check_older(t.to_relative_lock_time().unwrap()) {
-                        (Witness::empty(), Some(t))
-                    } else if root_has_sig {
-                        // If the root terminal has signature, the
-                        // signature covers the nLockTime and nSequence
-                        // values. The sender of the transaction should
-                        // take care that it signs the value such that the
-                        // timelock is not met
-                        (Witness::Impossible, None)
-                    } else {
-                        (Witness::Unavailable, None)
-                    };
+                let t = <RelLockTime as core::convert::TryFrom<_>>::try_from(t).unwrap();
+                let (stack, relative_timelock) = if stfr.check_older(t.into()) {
+                    (Witness::empty(), Some(t))
+                } else if root_has_sig {
+                    // If the root terminal has signature, the
+                    // signature covers the nLockTime and nSequence
+                    // values. The sender of the transaction should
+                    // take care that it signs the value such that the
+                    // timelock is not met
+                    (Witness::Impossible, None)
+                } else {
+                    (Witness::Unavailable, None)
+                };
                 Satisfaction { stack, has_sig: false, relative_timelock, absolute_timelock: None }
             }
             Terminal::Ripemd160(ref h) => Satisfaction {