fixup: making ci happy

Author: martinsaposnic

lightning/src/ln/functional_test_utils.rs

@@ -1805,8 +1805,8 @@ pub fn create_chan_between_nodes_with_value_a<'a, 'b, 'c: 'd, 'd>(
 }
 
 pub fn create_channel_manual_funding<'a, 'b, 'c: 'd, 'd>(
-	nodes: &'a Vec<Node<'b, 'c, 'd>>, initiator: usize, counterparty: usize,
-	channel_value: u64, push_msat: u64,
+	nodes: &'a Vec<Node<'b, 'c, 'd>>, initiator: usize, counterparty: usize, channel_value: u64,
+	push_msat: u64,
 ) -> (ChannelId, Transaction, OutPoint) {
 	let node_a = &nodes[initiator];
 	let node_b = &nodes[counterparty];
@@ -1829,14 +1829,12 @@ pub fn create_channel_manual_funding<'a, 'b, 'c: 'd, 'd>(
 		.unwrap();
 	check_added_monitors!(node_a, 0);
 
-	let funding_created =
-		get_event_msg!(node_a, MessageSendEvent::SendFundingCreated, node_b_id);
+	let funding_created = get_event_msg!(node_a, MessageSendEvent::SendFundingCreated, node_b_id);
 	node_b.node.handle_funding_created(node_a_id, &funding_created);
 	check_added_monitors!(node_b, 1);
 	let channel_id_b = expect_channel_pending_event(node_b, &node_a_id);
 
-	let funding_signed =
-		get_event_msg!(node_b, MessageSendEvent::SendFundingSigned, node_a_id);
+	let funding_signed = get_event_msg!(node_b, MessageSendEvent::SendFundingSigned, node_a_id);
 	node_a.node.handle_funding_signed(node_b_id, &funding_signed);
 	check_added_monitors!(node_a, 1);
 
@@ -1849,7 +1847,7 @@ pub fn create_channel_manual_funding<'a, 'b, 'c: 'd, 'd>(
 			Event::FundingTxBroadcastSafe { funding_txo, counterparty_node_id, .. } => {
 				assert_eq!(counterparty_node_id, node_b_id);
 				assert_eq!(funding_txo.txid, funding_txid);
-				assert_eq!(funding_txo.vout, funding_outpoint.index.into());
+				assert_eq!(funding_txo.vout, u32::from(funding_outpoint.index));
 			},
 			Event::ChannelPending { channel_id: pending_id, counterparty_node_id, .. } => {
 				assert_eq!(counterparty_node_id, node_b_id);

lightning/src/ln/functional_tests.rs

@@ -832,7 +832,7 @@ pub fn test_justice_tx_htlc_timeout() {
 		revoked_local_txn[1].input[0].witness.last().unwrap().len(),
 		OFFERED_HTLC_SCRIPT_WEIGHT
 	); // HTLC-Timeout
-	// Revoke the old state
+   // Revoke the old state
 	claim_payment(&nodes[0], &[&nodes[1]], payment_preimage_3);
 
 	{
@@ -6029,7 +6029,7 @@ pub fn test_announce_disable_channels() {
 		match e {
 			MessageSendEvent::BroadcastChannelUpdate { ref msg } => {
 				assert_eq!(msg.contents.channel_flags & (1 << 1), 1 << 1); // The "channel disabled" bit should be set
-															   // Check that each channel gets updated exactly once
+														   // Check that each channel gets updated exactly once
 				if chans_disabled
 					.insert(msg.contents.short_channel_id, msg.contents.timestamp)
 					.is_some()
@@ -9692,15 +9692,15 @@ fn test_manual_broadcast_skips_commitment_until_funding_seen() {
 		.find(|tx| {
 			tx.input.iter().any(|input| {
 				input.previous_output.txid == funding_txid
-					&& input.previous_output.vout == funding_outpoint.index.into()
+					&& input.previous_output.vout == u32::from(funding_outpoint.index)
 			})
 		})
 		.expect("commitment transaction not broadcast");
 	check_spends!(commitment_tx, funding_tx);
 	assert_eq!(commitment_tx.input.len(), 1);
 	let commitment_input = &commitment_tx.input[0];
 	assert_eq!(commitment_input.previous_output.txid, funding_txid);
-	assert_eq!(commitment_input.previous_output.vout, funding_outpoint.index.into());
+	assert_eq!(commitment_input.previous_output.vout, u32::from(funding_outpoint.index));
 
 	let monitor_events = nodes[0].chain_monitor.chain_monitor.get_and_clear_pending_events();
 	assert!(monitor_events.iter().all(|event| !matches!(event, Event::BumpTransaction(_))));
@@ -9761,7 +9761,7 @@ fn test_manual_broadcast_detects_funding_and_broadcasts_on_timeout() {
 		.find(|tx| {
 			tx.input.iter().any(|input| {
 				input.previous_output.txid == funding_txid
-					&& input.previous_output.vout == funding_outpoint.index.into()
+					&& input.previous_output.vout == u32::from(funding_outpoint.index)
 			})
 		})
 		.expect("commitment transaction not broadcast");