From f6c561062eeb1eef164ca7f9aada7ef0bfe55dfc Mon Sep 17 00:00:00 2001 From: "satsfy (Renato Britto)" Date: Sat, 4 Jul 2026 18:39:24 -0300 Subject: [PATCH] Drop obsolete unused-import workaround The `#[cfg(not(test))]` guard on the secp256k1 imports worked around a unused_imports warning tracked in rust-lang/rust#121684. That bug is fixed, so the guard is no longer needed. --- examples/psbt_sign_finalize.rs | 5 ++--- src/interpreter/error.rs | 4 +--- src/psbt/finalizer.rs | 4 +--- src/psbt/mod.rs | 4 +--- src/test_utils.rs | 1 - 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/examples/psbt_sign_finalize.rs b/examples/psbt_sign_finalize.rs index c5c1fe6fb..0e840e4be 100644 --- a/examples/psbt_sign_finalize.rs +++ b/examples/psbt_sign_finalize.rs @@ -6,10 +6,9 @@ use std::str::FromStr; use miniscript::bitcoin::consensus::encode::deserialize_hex; use miniscript::bitcoin::psbt::{self, Psbt}; use miniscript::bitcoin::sighash::SighashCache; -//use miniscript::bitcoin::secp256k1; // https://github.com/rust-lang/rust/issues/121684 use miniscript::bitcoin::{ - transaction, Address, Amount, Network, OutPoint, PrivateKey, Script, Sequence, Transaction, - TxIn, TxOut, + secp256k1, transaction, Address, Amount, Network, OutPoint, PrivateKey, Script, Sequence, + Transaction, TxIn, TxOut, }; use miniscript::psbt::{PsbtExt, PsbtInputExt}; use miniscript::Descriptor; diff --git a/src/interpreter/error.rs b/src/interpreter/error.rs index fde7f51ee..16ef63373 100644 --- a/src/interpreter/error.rs +++ b/src/interpreter/error.rs @@ -7,9 +7,7 @@ use std::error; use bitcoin::hashes::hash160; use bitcoin::hex::DisplayHex; -#[cfg(not(test))] // https://github.com/rust-lang/rust/issues/121684 -use bitcoin::secp256k1; -use bitcoin::{absolute, relative, taproot}; +use bitcoin::{absolute, relative, secp256k1, taproot}; use super::BitcoinKey; use crate::prelude::*; diff --git a/src/psbt/finalizer.rs b/src/psbt/finalizer.rs index 79cd50ce5..e36df3138 100644 --- a/src/psbt/finalizer.rs +++ b/src/psbt/finalizer.rs @@ -13,12 +13,10 @@ use core::mem; use bitcoin::hashes::hash160; use bitcoin::key::XOnlyPublicKey; -#[cfg(not(test))] // https://github.com/rust-lang/rust/issues/121684 -use bitcoin::secp256k1; use bitcoin::secp256k1::Secp256k1; use bitcoin::sighash::Prevouts; use bitcoin::taproot::LeafVersion; -use bitcoin::{PublicKey, Script, ScriptBuf, TxOut, Witness}; +use bitcoin::{secp256k1, PublicKey, Script, ScriptBuf, TxOut, Witness}; use super::{sanity_check, Error, InputError, Psbt, PsbtInputSatisfier}; use crate::prelude::*; diff --git a/src/psbt/mod.rs b/src/psbt/mod.rs index 07860217e..47c0600bb 100644 --- a/src/psbt/mod.rs +++ b/src/psbt/mod.rs @@ -14,12 +14,10 @@ use std::error; use bitcoin::hashes::{hash160, sha256d, Hash}; use bitcoin::psbt::{self, Psbt}; -#[cfg(not(test))] // https://github.com/rust-lang/rust/issues/121684 -use bitcoin::secp256k1; use bitcoin::secp256k1::{Secp256k1, VerifyOnly}; use bitcoin::sighash::{self, SighashCache}; use bitcoin::taproot::{self, ControlBlock, LeafVersion, TapLeafHash}; -use bitcoin::{absolute, bip32, relative, transaction, Script, ScriptBuf}; +use bitcoin::{absolute, bip32, relative, secp256k1, transaction, Script, ScriptBuf}; use crate::miniscript::context::SigType; use crate::prelude::*; diff --git a/src/test_utils.rs b/src/test_utils.rs index 9d52b7c25..f01219fb6 100644 --- a/src/test_utils.rs +++ b/src/test_utils.rs @@ -8,7 +8,6 @@ use std::str::FromStr; use bitcoin::hashes::{hash160, ripemd160, sha256}; use bitcoin::key::XOnlyPublicKey; -#[cfg(not(test))] // https://github.com/rust-lang/rust/issues/121684 use bitcoin::secp256k1; use crate::miniscript::context::SigType;