Test htlc outputs single tx claim due to timeout case

Author: Antoine Riard

src/ln/channelmanager.rs

@@ -3444,7 +3444,7 @@ mod tests {
 	#[test]
 	fn channel_monitor_claim_revoked_commitment_tx() {
 
-		let nodes = create_network(2);
+		let nodes = create_network(4);
 
 		// Create some new channel:
 		let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1);
@@ -3479,6 +3479,42 @@ mod tests {
 		get_announce_close_broadcast_events(&nodes, 0, 1);
 		assert_eq!(nodes[0].node.list_channels().len(), 0);
 		assert_eq!(nodes[1].node.list_channels().len(), 0);
+
+		let chan_2 = create_announced_chan_between_nodes(&nodes, 2, 3);
+
+		// Rebalance the network to generate htlc in the two directions
+		send_payment(&nodes[2], &vec!(&nodes[3])[..], 8000000);
+		// node[2] is gonna to revoke an old state thus node[3] should be able to claim both offered/received HTLC outputs on top of commitment tx, but this
+		// time as two different claim transactions as we're gonna to timeout htlc with given a high current heigh
+		let payment_preimage_3 = route_payment(&nodes[2], &vec!(&nodes[3])[..], 3000000).0;
+		let _payment_preimage_4 = route_payment(&nodes[3], &vec!(&nodes[2])[..], 3000000).0;
+
+		// Get the will-be-revoked local txn from node[2]
+		let revoked_local_txn = nodes[2].node.channel_state.lock().unwrap().by_id.iter().next().unwrap().1.last_local_commitment_txn.clone();
+
+		//Revoke the old state
+		claim_payment(&nodes[2], &vec!(&nodes[3])[..], payment_preimage_3);
+
+		{
+			let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
+
+			nodes[2].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![revoked_local_txn[0].clone()] }, 200);
+			test_txn_broadcast(&nodes[2], &chan_2, Some(revoked_local_txn[0].clone()), HTLCType::TIMEOUT);
+
+			nodes[3].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![revoked_local_txn[0].clone()] }, 200);
+			let node_txn = nodes[3].tx_broadcaster.txn_broadcasted.lock().unwrap();
+			assert_eq!(node_txn.len(), 10); // ChannelManager : 2, ChannelMontitor: 8 (2 revocation htlc tx, 1 local commitment tx + 1 htlc timeout tx) * 2 (block-rescan)
+			assert_eq!(node_txn[0].input.len(), 1);
+			assert_eq!(node_txn[1].input.len(), 1);
+
+			let mut funding_tx_map = HashMap::new();
+			funding_tx_map.insert(revoked_local_txn[0].txid(), revoked_local_txn[0].clone());
+			node_txn[0].verify(&funding_tx_map).unwrap();
+		}
+		get_announce_close_broadcast_events(&nodes, 2, 3);
+		assert_eq!(nodes[2].node.list_channels().len(), 0);
+		assert_eq!(nodes[3].node.list_channels().len(), 0);
+
 	}
 
 	#[test]

src/ln/channelmonitor.rs

@@ -1059,7 +1059,7 @@ impl ChannelMonitor {
 						};
 						let sighash_parts = bip143::SighashComponents::new(&single_htlc_tx);
 						sign_input!(sighash_parts, single_htlc_tx.input[0], Some(idx), htlc.amount_msat / 1000);
-						txn_to_broadcast.push(single_htlc_tx); // TODO: This is not yet tested in ChannelManager!
+						txn_to_broadcast.push(single_htlc_tx);
 					}
 				}
 			}