From 92b9597f8b8dc3694508062b5e7c5f23acbc3a4f Mon Sep 17 00:00:00 2001 From: Alekos Filini Date: Wed, 13 Jul 2022 10:27:38 +0200 Subject: [PATCH] Rename `set_current_height` to `current_height` 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`) --- src/wallet/mod.rs | 10 +++++----- src/wallet/tx_builder.rs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wallet/mod.rs b/src/wallet/mod.rs index dad10657..9231c3b7 100644 --- a/src/wallet/mod.rs +++ b/src/wallet/mod.rs @@ -2067,7 +2067,7 @@ pub(crate) mod test { .set_sync_time(sync_time) .unwrap(); let current_height = 25; - builder.set_current_height(current_height); + builder.current_height(current_height); let (psbt, _) = builder.finish().unwrap(); // current_height will override the last sync height @@ -2115,7 +2115,7 @@ pub(crate) mod test { let mut builder = wallet.build_tx(); builder .add_recipient(addr.script_pubkey(), 25_000) - .set_current_height(630_001) + .current_height(630_001) .nlocktime(630_000); let (psbt, _) = builder.finish().unwrap(); @@ -4916,7 +4916,7 @@ pub(crate) mod test { let mut builder = wallet.build_tx(); builder .add_recipient(addr.script_pubkey(), balance / 2) - .set_current_height(confirmation_time); + .current_height(confirmation_time); assert!(matches!( builder.finish().unwrap_err(), Error::InsufficientFunds { @@ -4929,7 +4929,7 @@ pub(crate) mod test { let mut builder = wallet.build_tx(); builder .add_recipient(addr.script_pubkey(), balance / 2) - .set_current_height(not_yet_mature_time); + .current_height(not_yet_mature_time); assert!(matches!( builder.finish().unwrap_err(), Error::InsufficientFunds { @@ -4942,7 +4942,7 @@ pub(crate) mod test { let mut builder = wallet.build_tx(); builder .add_recipient(addr.script_pubkey(), balance / 2) - .set_current_height(maturity_time); + .current_height(maturity_time); builder.finish().unwrap(); } } diff --git a/src/wallet/tx_builder.rs b/src/wallet/tx_builder.rs index 315a299a..0fee8aa9 100644 --- a/src/wallet/tx_builder.rs +++ b/src/wallet/tx_builder.rs @@ -556,7 +556,7 @@ impl<'a, D: BatchDatabase, Cs: CoinSelectionAlgorithm, Ctx: TxBuilderContext> /// add them using [`TxBuilder::add_utxos`]. /// /// 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 }