Skip to content

Commit d441ccd

Browse files
committed
ci: remove imports that are redundant with super::*
1 parent b87b4fb commit d441ccd

File tree

8 files changed

+6
-22
lines changed

8 files changed

+6
-22
lines changed

src/descriptor/mod.rs

+3-7
Original file line numberDiff line numberDiff line change
@@ -997,25 +997,21 @@ pub(crate) use write_descriptor;
997997
#[cfg(test)]
998998
mod tests {
999999
use core::convert::TryFrom;
1000-
use core::str::FromStr;
10011000

10021001
use bitcoin::blockdata::opcodes::all::{OP_CLTV, OP_CSV};
10031002
use bitcoin::blockdata::script::Instruction;
10041003
use bitcoin::blockdata::{opcodes, script};
10051004
use bitcoin::hashes::hex::FromHex;
1006-
use bitcoin::hashes::{hash160, sha256, Hash};
1005+
use bitcoin::hashes::Hash;
10071006
use bitcoin::script::PushBytes;
10081007
use bitcoin::sighash::EcdsaSighashType;
1009-
use bitcoin::{self, bip32, secp256k1, PublicKey, Sequence};
1008+
use bitcoin::{bip32, PublicKey, Sequence};
10101009

10111010
use super::checksum::desc_checksum;
1012-
use super::tr::Tr;
10131011
use super::*;
1014-
use crate::descriptor::key::Wildcard;
1015-
use crate::descriptor::{DescriptorPublicKey, DescriptorXKey, SinglePub};
10161012
#[cfg(feature = "compiler")]
10171013
use crate::policy;
1018-
use crate::{hex_script, Descriptor, Error, Miniscript, Satisfier};
1014+
use crate::hex_script;
10191015

10201016
type StdDescriptor = Descriptor<PublicKey>;
10211017
const TEST_PK: &str = "pk(020000000000000000000000000000000000000000000000000000000000000002)";

src/interpreter/inner.rs

-2
Original file line numberDiff line numberDiff line change
@@ -398,12 +398,10 @@ mod tests {
398398

399399
use bitcoin::blockdata::script;
400400
use bitcoin::hashes::hex::FromHex;
401-
use bitcoin::hashes::{hash160, sha256, Hash};
402401
use bitcoin::script::PushBytes;
403402
use bitcoin::{self, ScriptBuf};
404403

405404
use super::*;
406-
use crate::miniscript::analyzable::ExtParams;
407405

408406
struct KeyTestData {
409407
pk_spk: bitcoin::ScriptBuf,

src/interpreter/mod.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1024,14 +1024,11 @@ fn verify_sersig<'txin>(
10241024
mod tests {
10251025

10261026
use bitcoin;
1027-
use bitcoin::hashes::{hash160, ripemd160, sha256, Hash};
1028-
use bitcoin::secp256k1::{self, Secp256k1};
1027+
use bitcoin::secp256k1::Secp256k1;
10291028

10301029
use super::inner::ToNoChecks;
10311030
use super::*;
10321031
use crate::miniscript::analyzable::ExtParams;
1033-
use crate::miniscript::context::NoChecks;
1034-
use crate::{Miniscript, ToPublicKey};
10351032

10361033
#[allow(clippy::type_complexity)]
10371034
fn setup_keys_sigs(

src/plan.rs

-2
Original file line numberDiff line numberDiff line change
@@ -735,9 +735,7 @@ impl Assets {
735735
mod test {
736736
use std::str::FromStr;
737737

738-
use bitcoin::absolute::LockTime;
739738
use bitcoin::bip32::Xpub;
740-
use bitcoin::Sequence;
741739

742740
use super::*;
743741
use crate::*;

src/policy/concrete.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1146,8 +1146,6 @@ impl<Pk: MiniscriptKey> TreeLike for Arc<Policy<Pk>> {
11461146
mod compiler_tests {
11471147
use core::str::FromStr;
11481148

1149-
use sync::Arc;
1150-
11511149
use super::*;
11521150

11531151
#[test]

src/policy/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,9 @@ mod tests {
245245
#[cfg(feature = "compiler")]
246246
use crate::descriptor::Tr;
247247
use crate::miniscript::context::Segwitv0;
248-
use crate::miniscript::Miniscript;
249248
use crate::prelude::*;
250249
#[cfg(feature = "compiler")]
251-
use crate::{descriptor::TapTree, Descriptor, Tap};
250+
use crate::{descriptor::TapTree, Tap};
252251

253252
type ConcretePol = Concrete<String>;
254253
type SemanticPol = Semantic<String>;

src/policy/semantic.rs

-2
Original file line numberDiff line numberDiff line change
@@ -698,8 +698,6 @@ impl<Pk: MiniscriptKey> TreeLike for Arc<Policy<Pk>> {
698698

699699
#[cfg(test)]
700700
mod tests {
701-
use core::str::FromStr;
702-
703701
use bitcoin::PublicKey;
704702

705703
use super::*;

src/psbt/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,7 @@ mod tests {
14031403
use bitcoin::hashes::hex::FromHex;
14041404
use bitcoin::key::XOnlyPublicKey;
14051405
use bitcoin::secp256k1::PublicKey;
1406-
use bitcoin::{absolute, Amount, OutPoint, TxIn, TxOut};
1406+
use bitcoin::{Amount, OutPoint, TxIn, TxOut};
14071407

14081408
use super::*;
14091409
use crate::Miniscript;

0 commit comments

Comments
 (0)