Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/fix/273-2' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
dr-orlovsky committed Oct 15, 2024
2 parents 5002749 + 5ff9821 commit 4fbc55a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/vm/contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -375,12 +375,12 @@ impl Ord for WitnessPos {
match (self.layer1, other.layer1) {
(a, b) if a == b => self.height.cmp(&other.height),

Check warning on line 376 in src/vm/contract.rs

View check run for this annotation

Codecov / codecov/patch

src/vm/contract.rs#L375-L376

Added lines #L375 - L376 were not covered by tests
(Layer1::Bitcoin, Layer1::Liquid)
if (self.timestamp - other.timestamp).abs() >= BLOCK_TIME =>
if (self.timestamp - other.timestamp).abs() < BLOCK_TIME =>
{
Ordering::Greater

Check warning on line 380 in src/vm/contract.rs

View check run for this annotation

Codecov / codecov/patch

src/vm/contract.rs#L378-L380

Added lines #L378 - L380 were not covered by tests
}
(Layer1::Liquid, Layer1::Bitcoin)
if (other.timestamp - self.timestamp).abs() >= BLOCK_TIME =>
if (other.timestamp - self.timestamp).abs() < BLOCK_TIME =>
{
Ordering::Less

Check warning on line 385 in src/vm/contract.rs

View check run for this annotation

Codecov / codecov/patch

src/vm/contract.rs#L383-L385

Added lines #L383 - L385 were not covered by tests
}
Expand Down

0 comments on commit 4fbc55a

Please sign in to comment.