diff --git a/examples/psbt_sign_finalize.rs b/examples/psbt_sign_finalize.rs index 57f4104dc..9e9290099 100644 --- a/examples/psbt_sign_finalize.rs +++ b/examples/psbt_sign_finalize.rs @@ -9,8 +9,8 @@ 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, + transaction, Address, Amount, Network, OutPoint, PrivateKey, Script, Sequence, Transaction, + TxIn, TxOut, }; use miniscript::psbt::{PsbtExt, PsbtInputExt}; use miniscript::Descriptor; diff --git a/src/descriptor/mod.rs b/src/descriptor/mod.rs index 891d968cd..08bb1e418 100644 --- a/src/descriptor/mod.rs +++ b/src/descriptor/mod.rs @@ -1009,9 +1009,9 @@ mod tests { use super::checksum::desc_checksum; use super::*; + use crate::hex_script; #[cfg(feature = "compiler")] use crate::policy; - use crate::hex_script; type StdDescriptor = Descriptor; const TEST_PK: &str = "pk(020000000000000000000000000000000000000000000000000000000000000002)"; diff --git a/src/descriptor/tr.rs b/src/descriptor/tr.rs index 6e118fff7..23545cda8 100644 --- a/src/descriptor/tr.rs +++ b/src/descriptor/tr.rs @@ -3,12 +3,12 @@ use core::str::FromStr; use core::{cmp, fmt, hash}; +#[cfg(not(test))] // https://github.com/rust-lang/rust/issues/121684 +use bitcoin::secp256k1; use bitcoin::taproot::{ LeafVersion, TaprootBuilder, TaprootSpendInfo, TAPROOT_CONTROL_BASE_SIZE, TAPROOT_CONTROL_MAX_NODE_COUNT, TAPROOT_CONTROL_NODE_SIZE, }; -#[cfg(not(test))] // https://github.com/rust-lang/rust/issues/121684 -use bitcoin::secp256k1; use bitcoin::{opcodes, Address, Network, ScriptBuf}; use sync::Arc; diff --git a/src/policy/mod.rs b/src/policy/mod.rs index 1bae5c98d..8eb24b617 100644 --- a/src/policy/mod.rs +++ b/src/policy/mod.rs @@ -23,9 +23,9 @@ pub use self::semantic::Policy as Semantic; use crate::descriptor::Descriptor; use crate::miniscript::{Miniscript, ScriptContext}; use crate::sync::Arc; -use crate::{Error, MiniscriptKey, Terminal}; #[cfg(all(not(feature = "std"), not(test)))] use crate::Vec; +use crate::{Error, MiniscriptKey, Terminal}; /// Policy entailment algorithm maximum number of terminals allowed. const ENTAILMENT_MAX_TERMINALS: usize = 20;