milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Combine satisfied by into singe tests 

Include the satisfied by same time/height into the previous test that
checks above and below.
This commit is contained in:
Jamil Lambert, PhD 2025-01-24 15:46:00 +00:00
parent 33a7a35bbb
commit 922392268f
No known key found for this signature in database
GPG Key ID: 54DC29234AB5D2C0
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
primitives/src/locktime/absolute.rs
View File

@ -469,12 +469,14 @@ mod tests {
fn satisfied_by_height() { fn satisfied_by_height() {
let lock_by_height = LockTime::from_consensus(750_000); let lock_by_height = LockTime::from_consensus(750_000);
let height_same = Height::from_consensus(750_000).expect("failed to parse height");
let height_above = Height::from_consensus(800_000).expect("failed to parse height"); let height_above = Height::from_consensus(800_000).expect("failed to parse height");
let height_below = Height::from_consensus(700_000).expect("failed to parse height"); let height_below = Height::from_consensus(700_000).expect("failed to parse height");
let t: u32 = 1653195600; // May 22nd, 5am UTC. let t: u32 = 1653195600; // May 22nd, 5am UTC.
let time = Time::from_consensus(t).expect("invalid time value"); let time = Time::from_consensus(t).expect("invalid time value");
assert!(lock_by_height.is_satisfied_by(height_same, time));
assert!(lock_by_height.is_satisfied_by(height_above, time)); assert!(lock_by_height.is_satisfied_by(height_above, time));
assert!(!lock_by_height.is_satisfied_by(height_below, time)); assert!(!lock_by_height.is_satisfied_by(height_below, time));
} }
@ -483,39 +485,18 @@ mod tests {
fn satisfied_by_time() { fn satisfied_by_time() {
let lock_by_time = LockTime::from_consensus(1653195600); // May 22nd 2022, 5am UTC. let lock_by_time = LockTime::from_consensus(1653195600); // May 22nd 2022, 5am UTC.
let time = Time::from_consensus(1653195600).expect("May 22nd 2022, 5am UTC");
let day_after = Time::from_consensus(1653282000).expect("May 23rd 2022, 5am UTC"); let day_after = Time::from_consensus(1653282000).expect("May 23rd 2022, 5am UTC");
let day_before = Time::from_consensus(1653109200).expect("May 21th 2022, 5am UTC"); let day_before = Time::from_consensus(1653109200).expect("May 21th 2022, 5am UTC");
let height = Height::from_consensus(800_000).expect("failed to parse height"); let height = Height::from_consensus(800_000).expect("failed to parse height");
assert!(lock_by_time.is_satisfied_by(height, time));
assert!(lock_by_time.is_satisfied_by(height, day_after)); assert!(lock_by_time.is_satisfied_by(height, day_after));
assert!(!lock_by_time.is_satisfied_by(height, day_before)); assert!(!lock_by_time.is_satisfied_by(height, day_before));
} }
#[test]
fn satisfied_by_same_height() {
let h = 750_000;
let lock_by_height = LockTime::from_consensus(h);
let height = Height::from_consensus(h).expect("failed to parse height");
let t: u32 = 1653195600; // May 22nd, 5am UTC.
let time = Time::from_consensus(t).expect("invalid time value");
assert!(lock_by_height.is_satisfied_by(height, time))
}
#[test]
fn satisfied_by_same_time() {
let t: u32 = 1653195600; // May 22nd, 5am UTC.
let lock_by_time = LockTime::from_consensus(t);
let time = Time::from_consensus(t).expect("invalid time value");
let height = Height::from_consensus(800_000).expect("failed to parse height");
assert!(lock_by_time.is_satisfied_by(height, time))
}
#[test] #[test]
fn height_correctly_implies() { fn height_correctly_implies() {
let lock_by_height = LockTime::from_consensus(750_005); let lock_by_height = LockTime::from_consensus(750_005);