Use LOCKTIME_THRESHOLD same as bitcoin core

Author: tcharding

src/miniscript/limits.rs

@@ -17,7 +17,7 @@ pub const MAX_STANDARD_P2WSH_SCRIPT_SIZE: usize = 3600;
 /// The Threshold for deciding whether `nLockTime` is interpreted as
 /// time or height.
 // https://github.com/bitcoin/bitcoin/blob/9ccaee1d5e2e4b79b0a7c29aadb41b97e4741332/src/script/script.h#L39
-pub const HEIGHT_TIME_THRESHOLD: u32 = 500_000_000;
+pub const LOCKTIME_THRESHOLD: u32 = 500_000_000;
 
 /// Bit flag for deciding whether sequence number is
 /// interpreted as height or time

src/miniscript/satisfy.rs

@@ -28,7 +28,7 @@ use bitcoin::secp256k1::XOnlyPublicKey;
 use bitcoin::util::taproot::{ControlBlock, LeafVersion, TapLeafHash};
 
 use crate::miniscript::limits::{
-    HEIGHT_TIME_THRESHOLD, SEQUENCE_LOCKTIME_DISABLE_FLAG, SEQUENCE_LOCKTIME_TYPE_FLAG,
+    LOCKTIME_THRESHOLD, SEQUENCE_LOCKTIME_DISABLE_FLAG, SEQUENCE_LOCKTIME_TYPE_FLAG,
 };
 use crate::util::witness_size;
 use crate::{Miniscript, MiniscriptKey, ScriptContext, Terminal, ToPublicKey};
@@ -155,7 +155,7 @@ pub struct After(pub u32);
 impl<Pk: MiniscriptKey + ToPublicKey> Satisfier<Pk> for After {
     fn check_after(&self, n: u32) -> bool {
         // if n > self.0; we will be returning false anyways
-        if n < HEIGHT_TIME_THRESHOLD && self.0 >= HEIGHT_TIME_THRESHOLD {
+        if n < LOCKTIME_THRESHOLD && self.0 >= LOCKTIME_THRESHOLD {
             false
         } else {
             n <= self.0

src/miniscript/types/extra_props.rs

@@ -6,7 +6,7 @@ use std::iter::once;
 
 use super::{Error, ErrorKind, Property, ScriptContext};
 use crate::miniscript::limits::{
-    HEIGHT_TIME_THRESHOLD, SEQUENCE_LOCKTIME_DISABLE_FLAG, SEQUENCE_LOCKTIME_TYPE_FLAG,
+    LOCKTIME_THRESHOLD, SEQUENCE_LOCKTIME_DISABLE_FLAG, SEQUENCE_LOCKTIME_TYPE_FLAG,
 };
 use crate::{script_num_size, MiniscriptKey, Terminal};
 
@@ -339,8 +339,8 @@ impl Property for ExtData {
             timelock_info: TimeLockInfo {
                 csv_with_height: false,
                 csv_with_time: false,
-                cltv_with_height: t < HEIGHT_TIME_THRESHOLD,
-                cltv_with_time: t >= HEIGHT_TIME_THRESHOLD,
+                cltv_with_height: t < LOCKTIME_THRESHOLD,
+                cltv_with_time: t >= LOCKTIME_THRESHOLD,
                 contains_combination: false,
             },
             exec_stack_elem_count_sat: Some(1), // <t>

src/policy/concrete.rs

@@ -23,7 +23,7 @@ use bitcoin::hashes::{hash160, ripemd160, sha256, sha256d};
 
 use super::ENTAILMENT_MAX_TERMINALS;
 use crate::expression::{self, FromTree};
-use crate::miniscript::limits::{HEIGHT_TIME_THRESHOLD, SEQUENCE_LOCKTIME_TYPE_FLAG};
+use crate::miniscript::limits::{LOCKTIME_THRESHOLD, SEQUENCE_LOCKTIME_TYPE_FLAG};
 use crate::miniscript::types::extra_props::TimeLockInfo;
 #[cfg(feature = "compiler")]
 use crate::miniscript::ScriptContext;
@@ -284,8 +284,8 @@ impl<Pk: MiniscriptKey> Policy<Pk> {
             Policy::After(t) => TimeLockInfo {
                 csv_with_height: false,
                 csv_with_time: false,
-                cltv_with_height: t < HEIGHT_TIME_THRESHOLD,
-                cltv_with_time: t >= HEIGHT_TIME_THRESHOLD,
+                cltv_with_height: t < LOCKTIME_THRESHOLD,
+                cltv_with_time: t >= LOCKTIME_THRESHOLD,
                 contains_combination: false,
             },
             Policy::Older(t) => TimeLockInfo {