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

Merge bitcoindevkit/bdk#667: Rename set_current_height to current_height

Browse Source 
92b9597f8b8dc3694508062b5e7c5f23acbc3a4f Rename `set_current_height` to `current_height` (Alekos Filini)

Pull request description:

  ### Description

  Usually we don't have any prefix except for methods that can *add* to a list or replace the list entirely (e.g. `add_recipients` vs `set_recipients`)

  I missed this during review of #611

  ### 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:
  danielabrozzoni:
    utACK 92b9597f8b8dc3694508062b5e7c5f23acbc3a4f - I'm sorry I didn't notice it!

Tree-SHA512: 3391068b2761bcd04d740ef41f9e772039fca7bc0e0736afcbc582ec74b6c91eb155d9e09dd7a07462eec29e32ac86e41ba339d9a550af3f754164cab6bdbf61
This commit is contained in:
Alekos Filini 2022-07-13 14:43:17 +02:00
commit 844856d39e
No known key found for this signature in database
GPG Key ID: 431401E4A4530061
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wallet/mod.rs
View File

@ -2067,7 +2067,7 @@ pub(crate) mod test {
.set_sync_time(sync_time) .set_sync_time(sync_time)
.unwrap(); .unwrap();
let current_height = 25; let current_height = 25;
builder.set_current_height(current_height); builder.current_height(current_height);
let (psbt, _) = builder.finish().unwrap(); let (psbt, _) = builder.finish().unwrap();
// current_height will override the last sync height // current_height will override the last sync height
@ -2115,7 +2115,7 @@ pub(crate) mod test {
let mut builder = wallet.build_tx(); let mut builder = wallet.build_tx();
builder builder
.add_recipient(addr.script_pubkey(), 25_000) .add_recipient(addr.script_pubkey(), 25_000)
.set_current_height(630_001) .current_height(630_001)
.nlocktime(630_000); .nlocktime(630_000);
let (psbt, _) = builder.finish().unwrap(); let (psbt, _) = builder.finish().unwrap();
@ -4916,7 +4916,7 @@ pub(crate) mod test {
let mut builder = wallet.build_tx(); let mut builder = wallet.build_tx();
builder builder
.add_recipient(addr.script_pubkey(), balance / 2) .add_recipient(addr.script_pubkey(), balance / 2)
.set_current_height(confirmation_time); .current_height(confirmation_time);
assert!(matches!( assert!(matches!(
builder.finish().unwrap_err(), builder.finish().unwrap_err(),
Error::InsufficientFunds { Error::InsufficientFunds {
@ -4929,7 +4929,7 @@ pub(crate) mod test {
let mut builder = wallet.build_tx(); let mut builder = wallet.build_tx();
builder builder
.add_recipient(addr.script_pubkey(), balance / 2) .add_recipient(addr.script_pubkey(), balance / 2)
.set_current_height(not_yet_mature_time); .current_height(not_yet_mature_time);
assert!(matches!( assert!(matches!(
builder.finish().unwrap_err(), builder.finish().unwrap_err(),
Error::InsufficientFunds { Error::InsufficientFunds {
@ -4942,7 +4942,7 @@ pub(crate) mod test {
let mut builder = wallet.build_tx(); let mut builder = wallet.build_tx();
builder builder
.add_recipient(addr.script_pubkey(), balance / 2) .add_recipient(addr.script_pubkey(), balance / 2)
.set_current_height(maturity_time); .current_height(maturity_time);
builder.finish().unwrap(); builder.finish().unwrap();
} }
} }

2
src/wallet/tx_builder.rs
View File

@ -556,7 +556,7 @@ impl<'a, D: BatchDatabase, Cs: CoinSelectionAlgorithm<D>, Ctx: TxBuilderContext>
/// add them using [`TxBuilder::add_utxos`]. /// add them using [`TxBuilder::add_utxos`].
/// ///
/// In both cases, if you don't provide a current height, we use the last sync height. /// In both cases, if you don't provide a current height, we use the last sync height.
pub fn set_current_height(&mut self, height: u32) -> &mut Self { pub fn current_height(&mut self, height: u32) -> &mut Self {
self.params.current_height = Some(height); self.params.current_height = Some(height);
self self
} }