File tree 1 file changed +3
-6
lines changed
1 file changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -945,17 +945,14 @@ impl PackageTemplate {
945
945
}
946
946
signed_locktime
947
947
}
948
- fn minimum_locktime ( & self ) -> u32 {
949
- self . inputs . iter ( ) . filter_map ( |( _, outp) | outp. minimum_locktime ( ) ) . max ( ) . unwrap_or ( 0 )
950
- }
951
948
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 ( ) ;
953
950
954
951
if let Some ( signed_locktime) = self . signed_locktime ( ) {
955
- debug_assert ! ( signed_locktime >= minimum_locktime) ;
952
+ debug_assert ! ( minimum_locktime. is_none ( ) ) ;
956
953
signed_locktime
957
954
} else {
958
- core:: cmp:: max ( current_height, minimum_locktime)
955
+ core:: cmp:: max ( current_height, minimum_locktime. unwrap_or ( 0 ) )
959
956
}
960
957
}
961
958
pub ( crate ) fn package_weight ( & self , destination_script : & Script ) -> u64 {
You can’t perform that action at this time.
0 commit comments