frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bitcoindevkit/bdk#1001: Rename "keychanins" to keychains

Browse Source 
22b8a4884245449fcf60877ca031e0e9e7495de9 Rename "keychanins" to keychains (Daniela Brozzoni)

Pull request description:

  ### Checklists

  #### All Submissions:

  * [x] I've signed all my commits
  * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk/blob/master/CONTRIBUTING.md)
  * [x] I ran `cargo fmt` and `cargo clippy` before committing

ACKs for top commit:
  notmandatory:
    ACK 22b8a4884245449fcf60877ca031e0e9e7495de9

Tree-SHA512: 13ebbd597771a9d91c317fedc4dc506a275a641b764f24650cd13217cf8ac0d06c42a935a8c9e1e7f4761d2ade473c7f8381e90875e867b7a61381aa33cd8581
This commit is contained in:
Daniela Brozzoni 2023-06-02 00:42:30 +02:00
commit 8641847e6c
No known key found for this signature in database
GPG Key ID: 7DE4F1FDCED0AB87
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/bdk/src/wallet/mod.rs
View File

@ -248,7 +248,7 @@ impl<D> Wallet<D> {
} }
/// Iterator over all keychains in this wallet /// Iterator over all keychains in this wallet
pub fn keychanins(&self) -> &BTreeMap<KeychainKind, ExtendedDescriptor> { pub fn keychains(&self) -> &BTreeMap<KeychainKind, ExtendedDescriptor> {
self.keychain_tracker.txout_index.keychains() self.keychain_tracker.txout_index.keychains()
} }
@ -1508,7 +1508,7 @@ impl<D> Wallet<D> {
if params.add_global_xpubs { if params.add_global_xpubs {
let all_xpubs = self let all_xpubs = self
.keychanins() .keychains()
.iter() .iter()
.flat_map(|(_, desc)| desc.get_extended_keys()) .flat_map(|(_, desc)| desc.get_extended_keys())
.collect::<Vec<_>>(); .collect::<Vec<_>>();

2
crates/bdk/tests/wallet.rs
View File

@ -73,7 +73,7 @@ fn test_descriptor_checksum() {
assert_eq!(checksum.len(), 8); assert_eq!(checksum.len(), 8);
let raw_descriptor = wallet let raw_descriptor = wallet
.keychanins() .keychains()
.iter() .iter()
.next() .next()
.unwrap() .unwrap()