Skip to content

Commit e66bc64

Browse files
committed
Run rustfmt on CommitmentTransaction's builder
1 parent 09de3b7 commit e66bc64

File tree

1 file changed

+22
-9
lines changed

1 file changed

+22
-9
lines changed

lightning/src/ln/chan_utils.rs

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,7 +1748,6 @@ impl CommitmentTransaction {
17481748
)
17491749
}
17501750

1751-
#[rustfmt::skip]
17521751
fn build(
17531752
commitment_number: u64, per_commitment_point: &PublicKey, to_broadcaster_value_sat: u64,
17541753
to_broadcaster_value_offchain_msat: Option<u64>, to_countersignatory_value_sat: u64,
@@ -1758,15 +1757,32 @@ impl CommitmentTransaction {
17581757
) -> CommitmentTransaction {
17591758
let to_broadcaster_value_sat = Amount::from_sat(to_broadcaster_value_sat);
17601759
let to_countersignatory_value_sat = Amount::from_sat(to_countersignatory_value_sat);
1761-
let keys = TxCreationKeys::from_channel_static_keys(per_commitment_point, channel_parameters.broadcaster_pubkeys(), channel_parameters.countersignatory_pubkeys(), secp_ctx);
1760+
let keys = TxCreationKeys::from_channel_static_keys(
1761+
per_commitment_point,
1762+
channel_parameters.broadcaster_pubkeys(),
1763+
channel_parameters.countersignatory_pubkeys(),
1764+
secp_ctx,
1765+
);
17621766

17631767
// Build and sort the outputs of the transaction.
17641768
// Also sort the HTLC output data in `nondust_htlcs` in the same order, and populate the
17651769
// transaction output indices therein.
1766-
let outputs = Self::build_outputs_and_htlcs(&keys, to_broadcaster_value_sat, to_countersignatory_value_sat, &mut nondust_htlcs, channel_parameters);
1770+
let outputs = Self::build_outputs_and_htlcs(
1771+
&keys,
1772+
to_broadcaster_value_sat,
1773+
to_countersignatory_value_sat,
1774+
&mut nondust_htlcs,
1775+
channel_parameters,
1776+
);
17671777

1768-
let (obscured_commitment_transaction_number, txins) = Self::build_inputs(commitment_number, channel_parameters);
1769-
let transaction = Self::make_transaction(obscured_commitment_transaction_number, txins, outputs, channel_parameters);
1778+
let (obscured_commitment_transaction_number, txins) =
1779+
Self::build_inputs(commitment_number, channel_parameters);
1780+
let transaction = Self::make_transaction(
1781+
obscured_commitment_transaction_number,
1782+
txins,
1783+
outputs,
1784+
channel_parameters,
1785+
);
17701786
let txid = transaction.compute_txid();
17711787
CommitmentTransaction {
17721788
commitment_number,
@@ -1778,10 +1794,7 @@ impl CommitmentTransaction {
17781794
nondust_htlcs,
17791795
channel_type_features: channel_parameters.channel_type_features().clone(),
17801796
keys,
1781-
built: BuiltCommitmentTransaction {
1782-
transaction,
1783-
txid
1784-
},
1797+
built: BuiltCommitmentTransaction { transaction, txid },
17851798
}
17861799
}
17871800

0 commit comments

Comments
 (0)