Fix method names to mirror Rust bdk API (#185)

* Fix method names to mirror Rust bdk API

* Fix method names to mirror Rust bdk API
This commit is contained in:
thunderbiscuit 2022-08-18 14:35:17 -04:00 committed by GitHub
parent eed5554551
commit aa004201b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 deletions

View File

@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [Unreleased]
- Breaking Changes
- Rename `get_network()` method on `Wallet` interface to `network()` [#185]
- Rename `get_transactions()` method on `Wallet` interface to `list_transactions()` [#185]
- Remove `generate_extended_key`, returned ExtendedKeyInfo [#154]
- Remove `restore_extended_key`, returned ExtendedKeyInfo [#154]
- Remove dictionary `ExtendedKeyInfo {mnenonic, xprv, fingerprint}` [#154]
- APIs Added [#154] - APIs Added [#154]
- `generate_mnemonic()`, returns string mnemonic - `generate_mnemonic()`, returns string mnemonic
- `interface DescriptorSecretKey` - `interface DescriptorSecretKey`
@ -22,14 +28,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- `DescriptorSecretKey` - `DescriptorSecretKey`
- `DescriptorPublicKey` - `DescriptorPublicKey`
- `DerivationPath` - `DerivationPath`
- Dictionary Removed [#154]
- `ExtendedKeyInfo {mnenonic, xprv, fingerprint}`
- APIs Removed [#154]
- `generate_extended_key`, returned ExtendedKeyInfo
- `restore_extended_key`, returned ExtendedKeyInfo
[#154]: https://github.com/bitcoindevkit/bdk-ffi/pull/154 [#154]: https://github.com/bitcoindevkit/bdk-ffi/pull/154
[#184]: https://github.com/bitcoindevkit/bdk-ffi/pull/184 [#184]: https://github.com/bitcoindevkit/bdk-ffi/pull/184
[#185]: https://github.com/bitcoindevkit/bdk-ffi/pull/185
## [v0.8.0] ## [v0.8.0]
- Update BDK to version 0.20.0 [#169] - Update BDK to version 0.20.0 [#169]

View File

@ -182,9 +182,9 @@ interface Wallet {
boolean sign([ByRef] PartiallySignedBitcoinTransaction psbt); boolean sign([ByRef] PartiallySignedBitcoinTransaction psbt);
[Throws=BdkError] [Throws=BdkError]
sequence<Transaction> get_transactions(); sequence<Transaction> list_transactions();
Network get_network(); Network network();
[Throws=BdkError] [Throws=BdkError]
void sync([ByRef] Blockchain blockchain, Progress? progress); void sync([ByRef] Blockchain blockchain, Progress? progress);

View File

@ -319,7 +319,7 @@ impl Wallet {
self.wallet_mutex.lock().expect("wallet") self.wallet_mutex.lock().expect("wallet")
} }
fn get_network(&self) -> Network { fn network(&self) -> Network {
self.get_wallet().network() self.get_wallet().network()
} }
@ -354,7 +354,7 @@ impl Wallet {
self.get_wallet().sign(&mut psbt, SignOptions::default()) self.get_wallet().sign(&mut psbt, SignOptions::default())
} }
fn get_transactions(&self) -> Result<Vec<Transaction>, Error> { fn list_transactions(&self) -> Result<Vec<Transaction>, Error> {
let transactions = self.get_wallet().list_transactions(true)?; let transactions = self.get_wallet().list_transactions(true)?;
Ok(transactions.iter().map(Transaction::from).collect()) Ok(transactions.iter().map(Transaction::from).collect())
} }
@ -363,7 +363,7 @@ impl Wallet {
let unspents = self.get_wallet().list_unspent()?; let unspents = self.get_wallet().list_unspent()?;
Ok(unspents Ok(unspents
.iter() .iter()
.map(|u| LocalUtxo::from_utxo(u, self.get_network())) .map(|u| LocalUtxo::from_utxo(u, self.network()))
.collect()) .collect())
} }
} }