milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge rust-bitcoin/rust-bitcoin#2669: Minor fixes for latest rustc nightly 

12be5c0d27 clippy: fix a couple of nits in `clippy --no-default-features` (Andrew Poelstra)
7d07fc3fb9 ci: update the new nightly_version file in cron (Andrew Poelstra)

Pull request description:

  Fixes an issue with #2658 which accidentally disabled our nightly rustc update cronjob, and also fixes a small clippy lint.

  After this, we should be able to get back onto the latest nightly :).

ACKs for top commit:
  tcharding:
    ACK  12be5c0d27

Tree-SHA512: 771fb2c278b0aaea04454a3c397d4ca1c201ff59891d4f7af69a295aa4c6475320383fa5f4dd2a20323e79d5fe68b2ff37c3f01717a12f98afb9db3c2939c95a
This commit is contained in:
Andrew Poelstra 2024-04-08 12:49:02 +00:00
parent 5c56b69eed 12be5c0d27
commit 59a262e465
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/cron-daily-update-nightly.yml vendored
View File

@ -17,7 +17,7 @@ jobs:
# version of the compiler dtolnay/rust-toolchain gives us. # version of the compiler dtolnay/rust-toolchain gives us.
NIGHTLY_DATE=$(rustc +nightly --verbose --version | sed -ne 's/^commit-date: //p') NIGHTLY_DATE=$(rustc +nightly --verbose --version | sed -ne 's/^commit-date: //p')
# Update the nightly version in the reference file. # Update the nightly version in the reference file.
echo "nightly-${NIGHTLY_DATE}" > .github/nightly-version echo "nightly-${NIGHTLY_DATE}" > nightly-version
echo "nightly_date=${NIGHTLY_DATE}" >> $GITHUB_ENV echo "nightly_date=${NIGHTLY_DATE}" >> $GITHUB_ENV
# Some days there is no new nightly. In this case don't make an empty PR. # Some days there is no new nightly. In this case don't make an empty PR.
if ! git diff --exit-code > /dev/null; then if ! git diff --exit-code > /dev/null; then

4
bitcoin/tests/psbt-sign-taproot.rs
View File

@ -61,7 +61,7 @@ fn psbt_sign_taproot() {
let script3 = create_basic_single_sig_script(secp, sk_path[2].0); // m/86'/1'/0'/0/2 let script3 = create_basic_single_sig_script(secp, sk_path[2].0); // m/86'/1'/0'/0/2
// Just use one of the secret keys for the key path spend. // Just use one of the secret keys for the key path spend.
let kp = Keypair::from_seckey_str(secp, &sk_path[2].0).expect("failed to create keypair"); let kp = Keypair::from_seckey_str(secp, sk_path[2].0).expect("failed to create keypair");
let internal_key = kp.x_only_public_key().0; // Ignore the parity. let internal_key = kp.x_only_public_key().0; // Ignore the parity.
@ -118,7 +118,7 @@ fn psbt_sign_taproot() {
// script path spend // script path spend
{ {
// use private key of path "m/86'/1'/0'/0/1" as signing key // use private key of path "m/86'/1'/0'/0/1" as signing key
let kp = Keypair::from_seckey_str(secp, &sk_path[1].0).expect("failed to create keypair"); let kp = Keypair::from_seckey_str(secp, sk_path[1].0).expect("failed to create keypair");
let x_only_pubkey = kp.x_only_public_key().0; let x_only_pubkey = kp.x_only_public_key().0;
let signing_key_path = sk_path[1].1; let signing_key_path = sk_path[1].1;