Skip to content

Commit

Permalink
update MSRV to 1.48.0 from 1.41.1
Browse files Browse the repository at this point in the history
  • Loading branch information
apoelstra committed Jun 9, 2023
1 parent 3542f91 commit 53de6f2
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 16 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,8 @@ jobs:
env:
DO_INTEGRATION: true
- rust: beta
env:
DUMMY: true
- rust: nightly
env:
DUMMY: true
- rust: 1.41.1
env:
PIN_VERSIONS: true
- rust: 1.48.0
steps:
- name: Install test dependencies
run: sudo apt-get install -y binutils-dev libunwind8-dev
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ structures and network messages related to Elements

## Minimum Supported Rust Version (MSRV)

This library should always compile with any combination of features on **Rust 1.41.1**.
This library should always compile with any combination of features on **Rust 1.48.0**.
1 change: 1 addition & 0 deletions clippy.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msrv = "1.48.0"
4 changes: 1 addition & 3 deletions contrib/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@ then
fi

# Pin dependencies as required if we are using MSRV toolchain.
if cargo --version | grep "1\.41"; then
if cargo --version | grep "1\.48"; then
# 1.0.157 uses syn 2.0 which requires edition 2018
cargo update -p serde --precise 1.0.156
# 1.0.108 uses `matches!` macro so does not work with Rust 1.41.1, bad `syn` no biscuit.
cargo update -p syn --precise 1.0.107
fi

# Test without any features first
Expand Down
8 changes: 4 additions & 4 deletions elementsd-tests/src/taproot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -283,17 +283,17 @@ fn taproot_tests() {
SchnorrSigHashType::AllPlusAnyoneCanPay,
];

for conf_prevout in [true, false] {
for &conf_prevout in &[true, false] {
// whether the input is blinded
for blind in [true, false] {
for &blind in &[true, false] {
// blind the current tx
if !blind && conf_prevout {
// trying to spend a confidential txout to all explicit transactions
// This is not possible to do because we need to balance the blinding factors
continue;
}
for script_spend in [true, false] {
for sighash_ty in sighash_tys {
for &script_spend in &[true, false] {
for &sighash_ty in &sighash_tys {
taproot_spend_test(
&elementsd,
&secp,
Expand Down
2 changes: 1 addition & 1 deletion src/pset/serialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ impl Serialize for (XOnlyPublicKey, TapLeafHash) {
let ser_pk = self.0.serialize();
let mut buf = Vec::with_capacity(ser_pk.len() + TapLeafHash::LEN);
buf.extend(&ser_pk);
buf.extend(self.1.to_byte_array());
buf.extend(&self.1.to_byte_array());
buf
}
}
Expand Down

0 comments on commit 53de6f2

Please sign in to comment.