Remove identical if blocks

heap-coder · heap-coder · commit c8d5bf51608b · 2022-12-16T17:02:59.000+11:00
Clippy emits:

 error: this `if` has identical blocks

Move the second if clause into the first and use `||`.
diff --git a/src/policy/semantic.rs b/src/policy/semantic.rs
@@ -550,10 +550,9 @@ impl<Pk: MiniscriptKey> Policy<Pk> {
             Policy::Older(t) => {
                 if t.is_height_locked() && age.is_time_locked()
                     || t.is_time_locked() && age.is_height_locked()
+                    || t.to_consensus_u32() > age.to_consensus_u32()
                 {
                     Policy::Unsatisfiable
-                } else if t.to_consensus_u32() > age.to_consensus_u32() {
-                    Policy::Unsatisfiable
                 } else {
                     Policy::Older(t)
                 }

Original file line number	Diff line number	Diff line change
`@@ -550,10 +550,9 @@ impl<Pk: MiniscriptKey> Policy<Pk> {`
`550`	`550`	`Policy::Older(t) => {`
`551`	`551`	`if t.is_height_locked() && age.is_time_locked()`
`552`	`552`	`\|\| t.is_time_locked() && age.is_height_locked()`
	`553`	`+ \|\| t.to_consensus_u32() > age.to_consensus_u32()`
`553`	`554`	`{`
`554`	`555`	`Policy::Unsatisfiable`
`555`		`- } else if t.to_consensus_u32() > age.to_consensus_u32() {`
`556`		`- Policy::Unsatisfiable`
`557`	`556`	`} else {`
`558`	`557`	`Policy::Older(t)`
`559`	`558`	`}`