Skip to content

Commit

Permalink
bump MSRV to 1.56.1
Browse files Browse the repository at this point in the history
  • Loading branch information
apoelstra committed Jan 3, 2024
1 parent 613204f commit a110476
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ jobs:
run: ./contrib/test.sh

MSRV:
name: Test - 1.48.0 toolchain
name: Test - 1.56.1 toolchain
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- name: Checkout Crate
uses: actions/checkout@v3
- name: Checkout Toolchain
uses: dtolnay/rust-toolchain@1.48.0
uses: dtolnay/rust-toolchain@1.56.1
- name: Running test script
env:
DO_DOCS: false
Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.48.0"
msrv = "1.56.1"
13 changes: 3 additions & 10 deletions contrib/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,10 @@
FEATURES="serde"

# Pin dependencies as required if we are using MSRV toolchain.
if cargo --version | grep "1\.48"; then
cargo update -p serde_json --precise 1.0.99
# 1.0.157 uses syn 2.0 which requires edition 2018
cargo update -p serde --precise 1.0.156
cargo update -p once_cell --precise 1.13.1
cargo update -p quote --precise 1.0.28
cargo update -p proc-macro2 --precise 1.0.63
cargo update -p serde_test --precise 1.0.156

cargo update -p log --precise 0.4.18
if cargo --version | grep "1\.56"; then
cargo update -p tempfile --precise 3.6.0
cargo update -p once_cell --precise 1.13.1
cargo update -p which --precise 4.4.0
cargo update -p byteorder --precise 1.4.3
fi

Expand Down
2 changes: 1 addition & 1 deletion src/taproot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ mod tests{
let tree_info = builder.finalize(&secp, internal_key).unwrap();
let output_key = tree_info.output_key();

for script in vec![a, b, c, d, e] {
for script in [a, b, c, d, e] {
let ver_script = (script, LeafVersion::default());
let ctrl_block = tree_info.control_block(&ver_script).unwrap();
assert!(ctrl_block.verify_taproot_commitment(&secp, &output_key, &ver_script.0))
Expand Down
9 changes: 4 additions & 5 deletions src/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2374,10 +2374,9 @@ mod tests {
#[test]
fn superfluous_asset_issuance() {
let tx = Vec::<u8>::from_hex("1ae80068000109fee1000000000000000000000000000000000000000000000000000000000000005acf37f60000c7280028a7000000006e000000010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010115190000b9bfb80000000100000000d8d8d8d8d8d8d8d8d8d8d8d8d8d80000000000b8bfb8").unwrap();
if let encode::Error::ParseFailed("superfluous asset issuance") = Transaction::consensus_decode(&tx[..]).unwrap_err() {
// ok. FIXME replace this with matches! when we move to 1.48.0
} else {
panic!("Incorrect error for bad transaction");
}
assert!(matches!(
Transaction::consensus_decode(&tx[..]),
Err(encode::Error::ParseFailed("superfluous asset issuance")),
));
}
}

0 comments on commit a110476

Please sign in to comment.