diff --git a/CHANGELOG.md b/CHANGELOG.md index 59fc9a6a..6c2e63ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Wallet #### Changed - Removed the explicit `id` argument from `Wallet::add_signer()` since that's now part of `Signer` itself -- Renamed `ToWalletDescriptor::to_wallet_descriptor` to `ToWalletDescriptor::into_wallet_descriptor` +- Renamed `ToWalletDescriptor::to_wallet_descriptor` to `IntoWalletDescriptor::into_wallet_descriptor` ### Policy #### Changed diff --git a/src/descriptor/mod.rs b/src/descriptor/mod.rs index 4b9aec46..09c60e9f 100644 --- a/src/descriptor/mod.rs +++ b/src/descriptor/mod.rs @@ -72,7 +72,7 @@ pub type DerivedDescriptor<'s> = Descriptor>; pub type HDKeyPaths = BTreeMap; /// Trait for types which can be converted into an [`ExtendedDescriptor`] and a [`KeyMap`] usable by a wallet in a specific [`Network`] -pub trait ToWalletDescriptor { +pub trait IntoWalletDescriptor { /// Convert to wallet descriptor fn into_wallet_descriptor( self, @@ -81,7 +81,7 @@ pub trait ToWalletDescriptor { ) -> Result<(ExtendedDescriptor, KeyMap), DescriptorError>; } -impl ToWalletDescriptor for &str { +impl IntoWalletDescriptor for &str { fn into_wallet_descriptor( self, secp: &SecpCtx, @@ -107,7 +107,7 @@ impl ToWalletDescriptor for &str { } } -impl ToWalletDescriptor for &String { +impl IntoWalletDescriptor for &String { fn into_wallet_descriptor( self, secp: &SecpCtx, @@ -117,7 +117,7 @@ impl ToWalletDescriptor for &String { } } -impl ToWalletDescriptor for ExtendedDescriptor { +impl IntoWalletDescriptor for ExtendedDescriptor { fn into_wallet_descriptor( self, secp: &SecpCtx, @@ -127,7 +127,7 @@ impl ToWalletDescriptor for ExtendedDescriptor { } } -impl ToWalletDescriptor for (ExtendedDescriptor, KeyMap) { +impl IntoWalletDescriptor for (ExtendedDescriptor, KeyMap) { fn into_wallet_descriptor( self, secp: &SecpCtx, @@ -160,7 +160,7 @@ impl ToWalletDescriptor for (ExtendedDescriptor, KeyMap) { } } -impl ToWalletDescriptor for DescriptorTemplateOut { +impl IntoWalletDescriptor for DescriptorTemplateOut { fn into_wallet_descriptor( self, _secp: &SecpCtx, @@ -637,7 +637,7 @@ mod test { assert_eq!(wallet_desc.to_string(), "wpkh(tpubDEnoLuPdBep9bzw5LoGYpsxUQYheRQ9gcgrJhJEcdKFB9cWQRyYmkCyRoTqeD4tJYiVVgt6A3rN6rWn9RYhR9sBsGxji29LYWHuKKbdb1ev/0/*)#y8p7e8kk"); } - // test ToWalletDescriptor trait from &str with and without checksum appended + // test IntoWalletDescriptor trait from &str with and without checksum appended #[test] fn test_descriptor_from_str_with_checksum() { let secp = Secp256k1::new(); @@ -673,7 +673,7 @@ mod test { )); } - // test ToWalletDescriptor trait from &str with keys from right and wrong network + // test IntoWalletDescriptor trait from &str with keys from right and wrong network #[test] fn test_descriptor_from_str_with_keys_network() { let secp = Secp256k1::new(); @@ -717,7 +717,7 @@ mod test { )); } - // test ToWalletDescriptor trait from the output of the descriptor!() macro + // test IntoWalletDescriptor trait from the output of the descriptor!() macro #[test] fn test_descriptor_from_str_from_output_of_macro() { let secp = Secp256k1::new(); diff --git a/src/descriptor/policy.rs b/src/descriptor/policy.rs index 11f8ed86..f138dfdb 100644 --- a/src/descriptor/policy.rs +++ b/src/descriptor/policy.rs @@ -888,7 +888,7 @@ impl ExtractPolicy for Descriptor { #[cfg(test)] mod test { use crate::descriptor; - use crate::descriptor::{ExtractPolicy, ToWalletDescriptor}; + use crate::descriptor::{ExtractPolicy, IntoWalletDescriptor}; use super::*; use crate::descriptor::policy::SatisfiableItem::{Multisig, Signature, Thresh}; diff --git a/src/descriptor/template.rs b/src/descriptor/template.rs index 95d02921..98103dc6 100644 --- a/src/descriptor/template.rs +++ b/src/descriptor/template.rs @@ -32,7 +32,7 @@ use bitcoin::Network; use miniscript::{Legacy, Segwitv0}; -use super::{ExtendedDescriptor, KeyMap, ToWalletDescriptor}; +use super::{ExtendedDescriptor, IntoWalletDescriptor, KeyMap}; use crate::descriptor::DescriptorError; use crate::keys::{DerivableKey, ToDescriptorKey, ValidNetworks}; use crate::wallet::utils::SecpCtx; @@ -43,7 +43,7 @@ pub type DescriptorTemplateOut = (ExtendedDescriptor, KeyMap, ValidNetworks); /// Trait for descriptor templates that can be built into a full descriptor /// -/// Since [`ToWalletDescriptor`] is implemented for any [`DescriptorTemplate`], they can also be +/// Since [`IntoWalletDescriptor`] is implemented for any [`DescriptorTemplate`], they can also be /// passed directly to the [`Wallet`](crate::Wallet) constructor. /// /// ## Example @@ -69,7 +69,7 @@ pub trait DescriptorTemplate { /// Turns a [`DescriptorTemplate`] into a valid wallet descriptor by calling its /// [`build`](DescriptorTemplate::build) method -impl ToWalletDescriptor for T { +impl IntoWalletDescriptor for T { fn into_wallet_descriptor( self, secp: &SecpCtx, diff --git a/src/wallet/mod.rs b/src/wallet/mod.rs index f862b6e2..b2729ec7 100644 --- a/src/wallet/mod.rs +++ b/src/wallet/mod.rs @@ -67,7 +67,7 @@ use crate::database::{BatchDatabase, BatchOperations, DatabaseUtils}; use crate::descriptor::derived::AsDerived; use crate::descriptor::{ get_checksum, DerivedDescriptor, DerivedDescriptorMeta, DescriptorMeta, DescriptorScripts, - ExtendedDescriptor, ExtractPolicy, Policy, ToWalletDescriptor, XKeyUtils, + ExtendedDescriptor, ExtractPolicy, IntoWalletDescriptor, Policy, XKeyUtils, }; use crate::error::Error; use crate::psbt::PSBTUtils; @@ -110,7 +110,7 @@ where D: BatchDatabase, { /// Create a new "offline" wallet - pub fn new_offline( + pub fn new_offline( descriptor: E, change_descriptor: Option, network: Network, @@ -124,7 +124,7 @@ impl Wallet where D: BatchDatabase, { - fn _new( + fn _new( descriptor: E, change_descriptor: Option, network: Network, @@ -1247,7 +1247,7 @@ where { /// Create a new "online" wallet #[maybe_async] - pub fn new( + pub fn new( descriptor: E, change_descriptor: Option, network: Network, diff --git a/src/wallet/signer.rs b/src/wallet/signer.rs index 7199dbbd..aad07a20 100644 --- a/src/wallet/signer.rs +++ b/src/wallet/signer.rs @@ -560,7 +560,7 @@ impl Eq for SignersContainerKey {} mod signers_container_tests { use super::*; use crate::descriptor; - use crate::descriptor::ToWalletDescriptor; + use crate::descriptor::IntoWalletDescriptor; use crate::keys::{DescriptorKey, ToDescriptorKey}; use bitcoin::secp256k1::{All, Secp256k1}; use bitcoin::util::bip32;