Merge #516: Clarify that alloy tests don't actually test timelock mixing

apoelstra · apoelstra · commit 64b2b3d50d87 · 2023-01-16T14:58:49.000Z
e94efbf Clarify that alloy tests don't actually test timelock mixing (sanket1729) 62219d4 Fix CI (sanket1729) Pull request description: ACKs for top commit: tcharding: ACK e94efbf apoelstra: ACK e94efbf Tree-SHA512: 0e166887d75b7e2b688254a876c8ae9fb8233225aaacd6c963222b95cfa187abcee15ef84921ba684dd054c88bea3c19c1671735fb6102b5d8fe11b4df471f1e
diff --git a/src/miniscript/ms_tests.rs b/src/miniscript/ms_tests.rs
@@ -22073,6 +22073,8 @@ mod tests {
 
     }
 
+    // This does not actually test timelock mixing. See: https://github.com/rust-bitcoin/rust-miniscript/issues/514
+    // for details
     #[test]
     fn conflict_tests_from_alloy() {
         #[cfg_attr(feature="cargo-fmt", rustfmt_skip)]

Original file line number	Diff line number	Diff line change
`@@ -22073,6 +22073,8 @@ mod tests {`
`22073`	`22073`
`22074`	`22074`	`}`
`22075`	`22075`
	`22076`	`+ // This does not actually test timelock mixing. See: https://github.com/rust-bitcoin/rust-miniscript/issues/514`
	`22077`	`+ // for details`
`22076`	`22078`	`#[test]`
`22077`	`22079`	`fn conflict_tests_from_alloy() {`
`22078`	`22080`	`#[cfg_attr(feature="cargo-fmt", rustfmt_skip)]`