Skip to content

Commit ce723f1

Browse files
rustfmtstevenroose
rustfmt
authored andcommitted
Apply rustfmt
1 parent 6937186 commit ce723f1

File tree

2 files changed

+39
-12
lines changed

2 files changed

+39
-12
lines changed

crates/wallet/src/wallet/tx_builder.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,10 @@ impl<'a, Cs> TxBuilder<'a, Cs> {
543543

544544
/// Set a specific [`ConfirmationSpendPolicy`]. See [`TxBuilder::only_spend_confirmed`] and
545545
/// [`TxBuilder::only_spend_unconfirmed`] for some shortcuts.
546-
pub fn confirmation_policy(&mut self, confirmation_policy: ConfirmationSpendPolicy) -> &mut Self {
546+
pub fn confirmation_policy(
547+
&mut self,
548+
confirmation_policy: ConfirmationSpendPolicy,
549+
) -> &mut Self {
547550
self.params.confirmation_policy = confirmation_policy;
548551
self
549552
}
@@ -895,11 +898,11 @@ impl ConfirmationSpendPolicy {
895898
match self {
896899
ConfirmationSpendPolicy::UnconfirmedAllowed => true,
897900
ConfirmationSpendPolicy::OnlyConfirmed => utxo.chain_position.is_confirmed(),
898-
ConfirmationSpendPolicy::OnlyConfirmedSince { height } => {
899-
utxo.chain_position.confirmation_height_upper_bound().map(|h| {
900-
h <= *height
901-
}).unwrap_or(false)
902-
},
901+
ConfirmationSpendPolicy::OnlyConfirmedSince { height } => utxo
902+
.chain_position
903+
.confirmation_height_upper_bound()
904+
.map(|h| h <= *height)
905+
.unwrap_or(false),
903906
ConfirmationSpendPolicy::OnlyUnconfirmed => !utxo.chain_position.is_confirmed(),
904907
}
905908
}

crates/wallet/tests/wallet.rs

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -818,33 +818,57 @@ fn test_create_tx_confirmation_policy() {
818818
.only_spend_confirmed();
819819
let ret = builder.finish().unwrap();
820820
assert_eq!(ret.unsigned_tx.input.len(), 2);
821-
assert!(ret.unsigned_tx.input.iter().any(|i| i.previous_output.txid == funding_txid));
822-
assert!(ret.unsigned_tx.input.iter().any(|i| i.previous_output.txid == confirmed_txid));
821+
assert!(ret
822+
.unsigned_tx
823+
.input
824+
.iter()
825+
.any(|i| i.previous_output.txid == funding_txid));
826+
assert!(ret
827+
.unsigned_tx
828+
.input
829+
.iter()
830+
.any(|i| i.previous_output.txid == confirmed_txid));
823831

824832
let mut builder = wallet.build_tx();
825833
builder
826834
.add_recipient(addr.script_pubkey(), Amount::from_sat(51_000))
827835
.only_spend_confirmed_since(3_000);
828836
let ret = builder.finish().unwrap();
829837
assert_eq!(ret.unsigned_tx.input.len(), 2);
830-
assert!(ret.unsigned_tx.input.iter().any(|i| i.previous_output.txid == funding_txid));
831-
assert!(ret.unsigned_tx.input.iter().any(|i| i.previous_output.txid == confirmed_txid));
838+
assert!(ret
839+
.unsigned_tx
840+
.input
841+
.iter()
842+
.any(|i| i.previous_output.txid == funding_txid));
843+
assert!(ret
844+
.unsigned_tx
845+
.input
846+
.iter()
847+
.any(|i| i.previous_output.txid == confirmed_txid));
832848

833849
let mut builder = wallet.build_tx();
834850
builder
835851
.add_recipient(addr.script_pubkey(), Amount::from_sat(25_000))
836852
.only_spend_confirmed_since(2_500);
837853
let ret = builder.finish().unwrap();
838854
assert_eq!(ret.unsigned_tx.input.len(), 1);
839-
assert!(ret.unsigned_tx.input.iter().any(|i| i.previous_output.txid == funding_txid));
855+
assert!(ret
856+
.unsigned_tx
857+
.input
858+
.iter()
859+
.any(|i| i.previous_output.txid == funding_txid));
840860

841861
let mut builder = wallet.build_tx();
842862
builder
843863
.add_recipient(addr.script_pubkey(), Amount::from_sat(24_000))
844864
.only_spend_unconfirmed();
845865
let ret = builder.finish().unwrap();
846866
assert_eq!(ret.unsigned_tx.input.len(), 1);
847-
assert!(ret.unsigned_tx.input.iter().any(|i| i.previous_output.txid == unconfirmed_txid));
867+
assert!(ret
868+
.unsigned_tx
869+
.input
870+
.iter()
871+
.any(|i| i.previous_output.txid == unconfirmed_txid));
848872

849873
let mut builder = wallet.build_tx();
850874
builder

0 commit comments

Comments
 (0)