Skip to content

Commit 77ed78b

Browse files
committed
key.rs: remove some deprecated methods
These have been deprecated since 2ad6555 which made it into the 9.x release. Fine to delete them.
1 parent 7b3b3a8 commit 77ed78b

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

src/descriptor/key.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -810,10 +810,6 @@ impl DescriptorPublicKey {
810810
}
811811
}
812812

813-
/// Whether or not the key has a wildcard
814-
#[deprecated(note = "use has_wildcard instead")]
815-
pub fn is_deriveable(&self) -> bool { self.has_wildcard() }
816-
817813
/// Whether or not the key has a wildcard
818814
pub fn has_wildcard(&self) -> bool {
819815
match *self {
@@ -840,12 +836,6 @@ impl DescriptorPublicKey {
840836
false
841837
}
842838

843-
#[deprecated(note = "use at_derivation_index instead")]
844-
/// Deprecated name for [`Self::at_derivation_index`].
845-
pub fn derive(self, index: u32) -> Result<DefiniteDescriptorKey, ConversionError> {
846-
self.at_derivation_index(index)
847-
}
848-
849839
/// Replaces any wildcard (i.e. `/*`) in the key with a particular derivation index, turning it into a
850840
/// *definite* key (i.e. one where all the derivation paths are set).
851841
///

src/descriptor/mod.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -648,10 +648,6 @@ impl<Pk: MiniscriptKey> ForEachKey<Pk> for Descriptor<Pk> {
648648
}
649649

650650
impl Descriptor<DescriptorPublicKey> {
651-
/// Whether or not the descriptor has any wildcards
652-
#[deprecated(note = "use has_wildcards instead")]
653-
pub fn is_deriveable(&self) -> bool { self.has_wildcard() }
654-
655651
/// Whether or not the descriptor has any wildcards i.e. `/*`.
656652
pub fn has_wildcard(&self) -> bool { self.for_any_key(|key| key.has_wildcard()) }
657653

@@ -684,12 +680,6 @@ impl Descriptor<DescriptorPublicKey> {
684680
.map_err(|e| e.expect_translator_err("No Context errors while translating"))
685681
}
686682

687-
#[deprecated(note = "use at_derivation_index instead")]
688-
/// Deprecated name for [`Self::at_derivation_index`].
689-
pub fn derive(&self, index: u32) -> Result<Descriptor<DefiniteDescriptorKey>, ConversionError> {
690-
self.at_derivation_index(index)
691-
}
692-
693683
/// Convert all the public keys in the descriptor to [`bitcoin::PublicKey`] by deriving them or
694684
/// otherwise converting them. All [`bitcoin::secp256k1::XOnlyPublicKey`]s are converted to by adding a
695685
/// default(0x02) y-coordinate.

0 commit comments

Comments
 (0)