Satisfaction bugs

sanket1729 · sanket1729 · commit 73f68ffffbcd · 2021-11-24T09:28:48.000-08:00
diff --git a/src/miniscript/satisfy.rs b/src/miniscript/satisfy.rs
@@ -1048,7 +1048,8 @@ impl Satisfaction {
                     has_sig: rnsat.has_sig,
                 };
 
-                min_fn(dissat_1, dissat_2)
+                // Dissatisfactions don't need to non-malleable. Use minimum_mall always
+                Satisfaction::minimum_mall(dissat_1, dissat_2)
             }
             Terminal::Thresh(_, ref subs) => Satisfaction {
                 stack: subs.iter().fold(Witness::empty(), |acc, sub| {

Original file line number	Diff line number	Diff line change
`@@ -1048,7 +1048,8 @@ impl Satisfaction {`
`1048`	`1048`	`has_sig: rnsat.has_sig,`
`1049`	`1049`	`};`
`1050`	`1050`
`1051`		`- min_fn(dissat_1, dissat_2)`
	`1051`	`+ // Dissatisfactions don't need to non-malleable. Use minimum_mall always`
	`1052`	`+ Satisfaction::minimum_mall(dissat_1, dissat_2)`
`1052`	`1053`	`}`
`1053`	`1054`	`Terminal::Thresh(_, ref subs) => Satisfaction {`
`1054`	`1055`	`stack: subs.iter().fold(Witness::empty(), \|acc, sub\| {`