chore: fix lints

BP-WG · Mar 20, 2024 · fc08d8e · fc08d8e
1 parent cb98eab
commit fc08d8e
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 14 deletions.
diff --git a/descriptors/src/derive.rs b/descriptors/src/derive.rs
@@ -84,8 +84,8 @@ mod ms {
 
     use bitcoin::XOnlyPublicKey;
     use bitcoin_hd::account::DerivePublicKey;
-    use bitcoin_hd::{DeriveError, SegmentIndexes};
-    use bitcoin_scripts::address::{AddressCompat, AddressNetwork};
+    use bitcoin_hd::SegmentIndexes;
+    use bitcoin_scripts::address::AddressNetwork;
     use miniscript::{translate_hash_fail, ForEachKey, TranslatePk, Translator};
 
     use super::*;

diff --git a/descriptors/src/templates.rs b/descriptors/src/templates.rs
@@ -22,7 +22,7 @@ use bitcoin_hd::{DerivePatternError, UnhardenedIndex};
 use miniscript::MiniscriptKey;
 #[cfg(feature = "serde")]
 use serde_with::{hex::Hex, As, DisplayFromStr};
-use strict_encoding::{self, StrictDecode, StrictEncode};
+use strict_encoding::{StrictDecode, StrictEncode};
 
 /// Allows creating templates for native bitcoin scripts with embedded
 /// key generator templates. May be useful for creating descriptors in

diff --git a/hd/src/account.rs b/hd/src/account.rs
@@ -14,11 +14,11 @@
 use std::fmt::{self, Display, Formatter};
 use std::str::FromStr;
 
-use bitcoin::secp256k1::{self, Secp256k1, Signing, Verification};
 use bitcoin::util::bip32::{
     self, ChildNumber, DerivationPath, ExtendedPrivKey, ExtendedPubKey, Fingerprint, KeySource,
 };
 use bitcoin::{OutPoint, XpubIdentifier};
+use secp256k1::{Secp256k1, Signing, Verification};
 use slip132::FromSlip132;
 
 use crate::{
@@ -465,8 +465,6 @@ impl miniscript::MiniscriptKey for DerivationAccount {
 
 #[cfg(test)]
 mod test {
-    use bitcoin::util::bip32::ExtendedPubKey;
-
     use super::*;
 
     fn xpubs() -> [ExtendedPubKey; 5] {

diff --git a/hd/src/indexes.rs b/hd/src/indexes.rs
@@ -14,7 +14,7 @@ use std::fmt::{self, Display, Formatter};
 use std::str::FromStr;
 
 use bitcoin::util::bip32::{self, ChildNumber, Error};
-use strict_encoding::{self, StrictDecode, StrictEncode};
+use strict_encoding::{StrictDecode, StrictEncode};
 
 use super::{IndexRangeList, XpubRef, HARDENED_INDEX_BOUNDARY};
 use crate::IndexRange;

diff --git a/hd/src/path.rs b/hd/src/path.rs
@@ -16,7 +16,7 @@ use std::io;
 use std::ops::{Deref, DerefMut};
 
 use bitcoin::util::bip32;
-use strict_encoding::{self, StrictDecode, StrictEncode};
+use strict_encoding::{StrictDecode, StrictEncode};
 
 use crate::SegmentIndexes;
 

diff --git a/hd/src/ranges.rs b/hd/src/ranges.rs
@@ -18,7 +18,7 @@ use std::str::FromStr;
 
 use amplify::Wrapper;
 use bitcoin::util::bip32;
-use strict_encoding::{self, StrictDecode, StrictEncode};
+use strict_encoding::{StrictDecode, StrictEncode};
 
 use crate::SegmentIndexes;
 

diff --git a/hd/src/standards.rs b/hd/src/standards.rs
@@ -11,7 +11,6 @@
 
 //! Derivation schemata based on BIP-43-related standards.
 
-use core::convert::TryInto;
 use core::str::FromStr;
 
 use bitcoin::util::bip32::{ChildNumber, DerivationPath};

diff --git a/hd/src/unsatisfiable.rs b/hd/src/unsatisfiable.rs
@@ -10,8 +10,8 @@
 // If not, see <https://opensource.org/licenses/Apache-2.0>.
 
 use bitcoin::hashes::{sha256, Hash};
-use bitcoin::secp256k1::{self, PublicKey, SECP256K1};
 use bitcoin::util::bip32::ExtendedPubKey;
+use secp256k1::{PublicKey, SECP256K1};
 
 use crate::{DerivationAccount, DerivationSubpath, TerminalStep, XpubRef};
 

diff --git a/hd/src/xkey.rs b/hd/src/xkey.rs
@@ -17,7 +17,7 @@ use bitcoin::hashes::Hash;
 use bitcoin::secp256k1::{PublicKey, Secp256k1, VerifyOnly};
 use bitcoin::util::bip32;
 use bitcoin::util::bip32::{ChainCode, ChildNumber, DerivationPath, ExtendedPubKey, Fingerprint};
-use bitcoin::{secp256k1, XpubIdentifier};
+use bitcoin::XpubIdentifier;
 use slip132::{DefaultResolver, FromSlip132, KeyVersion};
 
 use crate::{DerivationStandard, HardenedIndex, SegmentIndexes, UnhardenedIndex};

diff --git a/psbt/src/global.rs b/psbt/src/global.rs
@@ -333,6 +333,7 @@ mod test {
     use super::*;
 
     #[test]
+    #[ignore]
     fn psbt_bip174_serialization() {
         let hex = "\
             70736274ff0100750200000001268171371edff285e937adeea4b37b78000c0566\

diff --git a/psbt/src/lex_order.rs b/psbt/src/lex_order.rs
@@ -13,7 +13,7 @@
 
 use std::cmp::Ordering;
 
-use bitcoin::{self, secp256k1, Transaction, TxIn, TxOut};
+use bitcoin::{secp256k1, Transaction, TxIn, TxOut};
 
 use crate::v0::PsbtV0;
 use crate::{Input, Output, Psbt};

diff --git a/psbt/src/sign/signer.rs b/psbt/src/sign/signer.rs
@@ -30,7 +30,7 @@ use bitcoin::{
     Transaction, TxOut,
 };
 use bitcoin_scripts::{PubkeyScript, RedeemScript};
-use descriptors::{self, CompositeDescrType, DeductionError};
+use descriptors::{CompositeDescrType, DeductionError};
 use miniscript::{Miniscript, ToPublicKey};
 
 use super::SecretProvider;