Skip to content

Commit 9b3ede8

Browse files
committed
ci: screw up imports for rust-lang/rust#121684
1 parent a5f9981 commit 9b3ede8

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

examples/psbt_sign_finalize.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ use miniscript::bitcoin::consensus::encode::deserialize;
77
use miniscript::bitcoin::hashes::hex::FromHex;
88
use miniscript::bitcoin::psbt::{self, Psbt};
99
use miniscript::bitcoin::sighash::SighashCache;
10+
//use miniscript::bitcoin::secp256k1; // https://github.com/rust-lang/rust/issues/121684
1011
use miniscript::bitcoin::{
11-
secp256k1, transaction, Address, Amount, Network, OutPoint, PrivateKey, Script, Sequence,
12+
transaction, Address, Amount, Network, OutPoint, PrivateKey, Script, Sequence,
1213
Transaction, TxIn, TxOut,
1314
};
1415
use miniscript::psbt::{PsbtExt, PsbtInputExt};

src/descriptor/key.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1142,7 +1142,7 @@ impl Serialize for DescriptorPublicKey {
11421142
mod test {
11431143
use core::str::FromStr;
11441144

1145-
use bitcoin::{bip32, secp256k1};
1145+
use bitcoin::bip32;
11461146
#[cfg(feature = "serde")]
11471147
use serde_test::{assert_tokens, Token};
11481148

src/interpreter/error.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ use std::error;
77

88
use bitcoin::hashes::hash160;
99
use bitcoin::hex::DisplayHex;
10-
use bitcoin::{secp256k1, taproot};
10+
#[cfg(not(test))] // https://github.com/rust-lang/rust/issues/121684
11+
use bitcoin::secp256k1;
12+
use bitcoin::taproot;
1113

1214
use super::BitcoinKey;
1315
use crate::prelude::*;

src/miniscript/iter.rs

-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ impl<'a, Pk: MiniscriptKey, Ctx: ScriptContext> Iterator for PkIter<'a, Pk, Ctx>
205205
#[cfg(test)]
206206
pub mod test {
207207
use bitcoin::hashes::{hash160, ripemd160, sha256, sha256d, Hash};
208-
use bitcoin::secp256k1;
209208

210209
use super::Miniscript;
211210
use crate::miniscript::context::Segwitv0;

src/miniscript/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ mod tests {
603603
use bitcoin::hashes::{hash160, sha256, Hash};
604604
use bitcoin::secp256k1::XOnlyPublicKey;
605605
use bitcoin::taproot::TapLeafHash;
606-
use bitcoin::{secp256k1, Sequence};
606+
use bitcoin::Sequence;
607607
use sync::Arc;
608608

609609
use super::{Miniscript, ScriptContext, Segwitv0, Tap};

src/policy/compiler.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,7 @@ mod tests {
11511151
use core::str::FromStr;
11521152

11531153
use bitcoin::blockdata::{opcodes, script};
1154-
use bitcoin::{hashes, secp256k1, Sequence};
1154+
use bitcoin::{hashes, Sequence};
11551155

11561156
use super::*;
11571157
use crate::miniscript::{Legacy, Segwitv0, Tap};

0 commit comments

Comments
 (0)