f Fix splice test by handling any input&output order

Author: optout21

lightning/src/ln/splicing_tests.rs

@@ -28,6 +28,7 @@ fn test_v1_splice_in() {
 
 	let channel_value_sat = 100_000;
 	let channel_reserve_amnt_sat = 1_000;
+	let expect_outputs_in_reverse = true;
 
 	let (_, _, channel_id, _) = create_announced_chan_between_nodes_with_value(
 		&nodes,
@@ -142,17 +143,24 @@ fn test_v1_splice_in() {
 		acceptor_node.node.get_our_node_id()
 	);
 	dbg!(&tx_add_input_msg);
-	// check which input is this
-	let inputs_seen_in_reverse = if let Some(prevtx) = tx_add_input_msg.prevtx.as_ref() {
-		let value = prevtx
-			.as_transaction()
-			.output[tx_add_input_msg.prevtx_out as usize]
+	// check which input is this (order is non-deterministic), based on the presense of prevtx
+	let inputs_seen_in_reverse = tx_add_input_msg.prevtx.is_some();
+	if !inputs_seen_in_reverse {
+		// Input is the revious funding input
+		assert_eq!(tx_add_input_msg.prevtx, None);
+		assert_eq!(
+			tx_add_input_msg.shared_input_txid.unwrap().to_string(),
+			"4f128bedf1a15baf465ab1bfd6e97c8f82628f4156bf86eb1cbc132cda6733ae"
+		);
+	} else {
+		// Input is the extra input
+		let prevtx_value = tx_add_input_msg.prevtx.as_ref().unwrap().as_transaction().output
+			[tx_add_input_msg.prevtx_out as usize]
 			.value
 			.to_sat();
-		value == extra_splice_funding_input_sats
-	} else {
-		false
-	};
+		assert_eq!(prevtx_value, extra_splice_funding_input_sats);
+		assert_eq!(tx_add_input_msg.shared_input_txid, None);
+	}
 
 	let _res = acceptor_node
 		.node
@@ -167,17 +175,28 @@ fn test_v1_splice_in() {
 		.node
 		.handle_tx_complete(acceptor_node.node.get_our_node_id(), &tx_complete_msg);
 	// Second input
-	let exp_value =
-		if inputs_seen_in_reverse { channel_value_sat } else { extra_splice_funding_input_sats };
 	let tx_add_input2_msg = get_event_msg!(
 		&initiator_node,
 		MessageSendEvent::SendTxAddInput,
 		acceptor_node.node.get_our_node_id()
 	);
 	dbg!(&tx_add_input2_msg);
-	// FIXME: Determine why these fail
-	//assert_eq!(tx_add_input2_msg.prevtx, None);
-	//assert_eq!(tx_add_input2_msg.shared_input_txid.unwrap().to_string(), "4f128bedf1a15baf465ab1bfd6e97c8f82628f4156bf86eb1cbc132cda6733ae");
+	if !inputs_seen_in_reverse {
+		// Input is the extra input
+		let prevtx_value = tx_add_input2_msg.prevtx.as_ref().unwrap().as_transaction().output
+			[tx_add_input2_msg.prevtx_out as usize]
+			.value
+			.to_sat();
+		assert_eq!(prevtx_value, extra_splice_funding_input_sats);
+		assert_eq!(tx_add_input2_msg.shared_input_txid, None);
+	} else {
+		// Input is the revious funding input
+		assert_eq!(tx_add_input2_msg.prevtx, None);
+		assert_eq!(
+			tx_add_input2_msg.shared_input_txid.unwrap().to_string(),
+			"4f128bedf1a15baf465ab1bfd6e97c8f82628f4156bf86eb1cbc132cda6733ae"
+		);
+	}
 
 	let _res = acceptor_node
 		.node
@@ -199,9 +218,13 @@ fn test_v1_splice_in() {
 		acceptor_node.node.get_our_node_id()
 	);
 	dbg!(&tx_add_output_msg);
-	// FIXME: Determine why these fail
-	//assert!(tx_add_output_msg.script.is_p2wsh());
-	//assert_eq!(tx_add_output_msg.sats, post_splice_channel_value);
+	if !expect_outputs_in_reverse {
+		assert!(tx_add_output_msg.script.is_p2wsh());
+		assert_eq!(tx_add_output_msg.sats, post_splice_channel_value);
+	} else {
+		assert!(tx_add_output_msg.script.is_p2wpkh());
+		assert_eq!(tx_add_output_msg.sats, 14146); // extra_splice_funding_input_sats - splice_in_sats
+	}
 
 	let _res = acceptor_node
 		.node
@@ -222,9 +245,13 @@ fn test_v1_splice_in() {
 		acceptor_node.node.get_our_node_id()
 	);
 	dbg!(&tx_add_output2_msg);
-	// FIXME: Determine why these fail
-	//assert!(tx_add_output2_msg.script.is_p2wpkh());
-	//assert_eq!(tx_add_output2_msg.sats, 14094); // extra_splice_input_sats - splice_in_sats
+	if !expect_outputs_in_reverse {
+		assert!(tx_add_output2_msg.script.is_p2wpkh());
+		assert_eq!(tx_add_output2_msg.sats, 14146); // extra_splice_funding_input_sats - splice_in_sats
+	} else {
+		assert!(tx_add_output2_msg.script.is_p2wsh());
+		assert_eq!(tx_add_output2_msg.sats, post_splice_channel_value);
+	}
 
 	let _res = acceptor_node
 		.node