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

Merge bitcoindevkit/bdk#1455: refactor(wallet): rename get_balance() to balance()

Browse Source 
50137b0425 refactor(wallet): rename get_balance() to balance() (Steve Myers)

Pull request description:

  ### Description

  fixes #1221

  ### Notes to the reviewers

  See discussion in #1221.

  ### Changelog notice

  Changed

  - Wallet::get_balance() renamed to Wallet::balance()

  ### 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:
  LagginTimes:
    ACK 50137b0425
  oleonardolima:
    ACK 50137b0425
  evanlinjin:
    ACK 50137b0425

Tree-SHA512: 20d188a32c79eca37b4f269e5bcdb8c2ecd595911558cb74812a37da13a4f39b603deed3bc11356aa6523b16417a2a025046b3dd4df5bd7247f39c29d7f48ac2
This commit is contained in:
Steve Myers
2024-06-04 17:07:13 -05:00
parent 26586fa7fe 50137b0425
commit 363d9f42e5
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/wallet/README.md
View File

@@ -101,7 +101,7 @@ fn main() {
<!-- wallet.sync(&blockchain, SyncOptions::default())?; -->
<!-- println!("Descriptor balance: {} SAT", wallet.get_balance()?); -->
<!-- println!("Descriptor balance: {} SAT", wallet.balance()?); -->
<!-- Ok(()) -->
<!-- } -->

2
crates/wallet/src/wallet/mod.rs
View File

@@ -1215,7 +1215,7 @@ impl Wallet {
/// Return the balance, separated into available, trusted-pending, untrusted-pending and immature
/// values.
pub fn get_balance(&self) -> Balance {
pub fn balance(&self) -> Balance {
self.indexed_graph.graph().balance(
&self.chain,
self.chain.tip().block_id(),

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

@@ -171,7 +171,7 @@ fn test_psbt_multiple_internalkey_signers() {
let keypair = Keypair::from_secret_key(&secp, &prv.inner);
let (mut wallet, _) = get_funded_wallet(&desc);
let to_spend = wallet.get_balance().total();
let to_spend = wallet.balance().total();
let send_to = wallet.peek_address(KeychainKind::External, 0);
let mut builder = wallet.build_tx();
builder.drain_to(send_to.script_pubkey()).drain_wallet();

6
crates/wallet/tests/wallet.rs
View File

@@ -292,7 +292,7 @@ fn test_get_funded_wallet_balance() {
// The funded wallet contains a tx with a 76_000 sats input and two outputs, one spending 25_000
// to a foreign address and one returning 50_000 back to the wallet as change. The remaining 1000
// sats are the transaction fee.
assert_eq!(wallet.get_balance().confirmed, Amount::from_sat(50_000));
assert_eq!(wallet.balance().confirmed, Amount::from_sat(50_000));
}
#[test]
@@ -3713,7 +3713,7 @@ fn test_spend_coinbase() {
let not_yet_mature_time = confirmation_height + COINBASE_MATURITY - 1;
let maturity_time = confirmation_height + COINBASE_MATURITY;
let balance = wallet.get_balance();
let balance = wallet.balance();
assert_eq!(
balance,
Balance {
@@ -3764,7 +3764,7 @@ fn test_spend_coinbase() {
hash: BlockHash::all_zeros(),
})
.unwrap();
let balance = wallet.get_balance();
let balance = wallet.balance();
assert_eq!(
balance,
Balance {