Merge pull request #3783 from TheBlueMatt/2025-05-rustfmt-tests-2

Run rustfmt on `chain/transaction`, `chain/chaininterface`, `max_payment_path_len_tests`, and `chanmon_update_fail_tests`

Author: tnull

lightning/src/chain/chaininterface.rs

@@ -1,5 +1,3 @@
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
 // This file is Copyright its original authors, visible in version control
 // history.
 //
@@ -189,25 +187,29 @@ pub const FEERATE_FLOOR_SATS_PER_KW: u32 = 253;
 ///
 /// Note that this does *not* implement [`FeeEstimator`] to make it harder to accidentally mix the
 /// two.
-pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F) where F::Target: FeeEstimator;
-
-impl<F: Deref> LowerBoundedFeeEstimator<F> where F::Target: FeeEstimator {
+pub(crate) struct LowerBoundedFeeEstimator<F: Deref>(pub F)
+where
+	F::Target: FeeEstimator;
+
+impl<F: Deref> LowerBoundedFeeEstimator<F>
+where
+	F::Target: FeeEstimator,
+{
 	/// Creates a new `LowerBoundedFeeEstimator` which wraps the provided fee_estimator
 	pub fn new(fee_estimator: F) -> Self {
 		LowerBoundedFeeEstimator(fee_estimator)
 	}
 
 	pub fn bounded_sat_per_1000_weight(&self, confirmation_target: ConfirmationTarget) -> u32 {
-		cmp::max(
-			self.0.get_est_sat_per_1000_weight(confirmation_target),
-			FEERATE_FLOOR_SATS_PER_KW,
-		)
+		cmp::max(self.0.get_est_sat_per_1000_weight(confirmation_target), FEERATE_FLOOR_SATS_PER_KW)
 	}
 }
 
 #[cfg(test)]
 mod tests {
-	use super::{FEERATE_FLOOR_SATS_PER_KW, LowerBoundedFeeEstimator, ConfirmationTarget, FeeEstimator};
+	use super::{
+		ConfirmationTarget, FeeEstimator, LowerBoundedFeeEstimator, FEERATE_FLOOR_SATS_PER_KW,
+	};
 
 	struct TestFeeEstimator {
 		sat_per_kw: u32,
@@ -225,7 +227,10 @@ mod tests {
 		let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 		let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);
 
-		assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), FEERATE_FLOOR_SATS_PER_KW);
+		assert_eq!(
+			fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
+			FEERATE_FLOOR_SATS_PER_KW
+		);
 	}
 
 	#[test]
@@ -234,6 +239,9 @@ mod tests {
 		let test_fee_estimator = &TestFeeEstimator { sat_per_kw };
 		let fee_estimator = LowerBoundedFeeEstimator::new(test_fee_estimator);
 
-		assert_eq!(fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee), sat_per_kw);
+		assert_eq!(
+			fee_estimator.bounded_sat_per_1000_weight(ConfirmationTarget::AnchorChannelFee),
+			sat_per_kw
+		);
 	}
 }

lightning/src/chain/transaction.rs

@@ -1,5 +1,3 @@
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
 // This file is Copyright its original authors, visible in version control
 // history.
 //
@@ -63,10 +61,7 @@ impl OutPoint {
 	/// This is not exported to bindings users as the same type is used universally in the C bindings
 	/// for all outpoints
 	pub fn into_bitcoin_outpoint(self) -> BitcoinOutPoint {
-		BitcoinOutPoint {
-			txid: self.txid,
-			vout: self.index as u32,
-		}
+		BitcoinOutPoint { txid: self.txid, vout: self.index as u32 }
 	}
 }
 
@@ -92,20 +87,24 @@ mod tests {
 	use crate::chain::transaction::OutPoint;
 	use crate::ln::types::ChannelId;
 
-	use bitcoin::transaction::Transaction;
 	use bitcoin::consensus::encode;
 	use bitcoin::hex::FromHex;
+	use bitcoin::transaction::Transaction;
 
 	#[test]
 	fn test_channel_id_calculation() {
-		let tx: Transaction = encode::deserialize(&<Vec<u8>>::from_hex("020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000").unwrap()[..]).unwrap();
-		assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
-			txid: tx.compute_txid(),
-			index: 0
-		}).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e").unwrap()[..]);
-		assert_eq!(&ChannelId::v1_from_funding_outpoint(OutPoint {
-			txid: tx.compute_txid(),
-			index: 1
-		}).0[..], &<Vec<u8>>::from_hex("3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f").unwrap()[..]);
+		let tx_hex = "020000000001010e0adef48412e4361325ac1c6e36411299ab09d4f083b9d8ddb55fbc06e1b0c00000000000feffffff0220a1070000000000220020f81d95e040bd0a493e38bae27bff52fe2bb58b93b293eb579c01c31b05c5af1dc072cfee54a3000016001434b1d6211af5551905dc2642d05f5b04d25a8fe80247304402207f570e3f0de50546aad25a872e3df059d277e776dda4269fa0d2cc8c2ee6ec9a022054e7fae5ca94d47534c86705857c24ceea3ad51c69dd6051c5850304880fc43a012103cb11a1bacc223d98d91f1946c6752e358a5eb1a1c983b3e6fb15378f453b76bd00000000";
+		let tx: Transaction =
+			encode::deserialize(&<Vec<u8>>::from_hex(tx_hex).unwrap()[..]).unwrap();
+
+		let txid = tx.compute_txid();
+
+		let id_0 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 0 });
+		let expected_0 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25e";
+		assert_eq!(&id_0.0[..], &Vec::<u8>::from_hex(expected_0).unwrap()[..]);
+
+		let id_1 = ChannelId::v1_from_funding_outpoint(OutPoint { txid, index: 1 });
+		let expected_1 = "3e88dd7165faf7be58b3c5bb2c9c452aebef682807ea57080f62e6f6e113c25f";
+		assert_eq!(&id_1.0[..], &Vec::<u8>::from_hex(expected_1).unwrap()[..]);
 	}
 }