Skip to content

Commit b68bf14

Browse files
committed
f Adjust PackageTemplate minimum locktime
Inline `PackageTemplate::minimum_locktime` function as it's only used once, and verify a signed locktime isn't combined with a minimum locktime.
1 parent 4e3c759 commit b68bf14

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

lightning/src/chain/package.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -945,17 +945,14 @@ impl PackageTemplate {
945945
}
946946
signed_locktime
947947
}
948-
fn minimum_locktime(&self) -> u32 {
949-
self.inputs.iter().filter_map(|(_, outp)| outp.minimum_locktime()).max().unwrap_or(0)
950-
}
951948
pub(crate) fn package_locktime(&self, current_height: u32) -> u32 {
952-
let minimum_locktime = self.minimum_locktime();
949+
let minimum_locktime = self.inputs.iter().filter_map(|(_, outp)| outp.minimum_locktime()).max();
953950

954951
if let Some(signed_locktime) = self.signed_locktime() {
955-
debug_assert!(signed_locktime >= minimum_locktime);
952+
debug_assert!(minimum_locktime.is_none());
956953
signed_locktime
957954
} else {
958-
core::cmp::max(current_height, minimum_locktime)
955+
core::cmp::max(current_height, minimum_locktime.unwrap_or(0))
959956
}
960957
}
961958
pub(crate) fn package_weight(&self, destination_script: &Script) -> u64 {

0 commit comments

Comments
 (0)