Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ you may need to pin as follows:
```
cargo update --package url --precise 2.2.2
cargo update --package form_urlencoded --precise 1.0.1
cargo update -p once_cell --precise 1.13.1
cargo update -p bzip2 --precise 0.4.2
```

## Contributing
Expand Down
1 change: 1 addition & 0 deletions contrib/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ if cargo --version | grep "1\.41\.0"; then
cargo update -p url --precise 2.2.2
cargo update -p form_urlencoded --precise 1.0.1
cargo update -p once_cell --precise 1.13.1
cargo update -p bzip2 --precise 0.4.2
fi

# Pin dependencies required to build with Rust 1.47.0
Expand Down
2 changes: 2 additions & 0 deletions src/miniscript/ms_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down