Add test for onchain resolution of channel with a success, passing

preimage backwards.

Author: Antoine Riard

src/ln/channelmanager.rs

@@ -3564,49 +3564,6 @@ mod tests {
 		}
 	}
 
-	//#[test]
-	fn test_htlc_on_chain_timeout() {
-		// Test that in case of an unilateral close onchain, we detect the state of HTLC (timeout) thanks to 
-		// ChainWtachInterface and pass the timeout backward
-		// A -------> B --------> C --------> D (timeout)
-		//               output          input
-
-		let nodes = create_network(4);
-
-		// Create some initial channels
-		let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1);
-		let chan_2 = create_announced_chan_between_nodes(&nodes, 1, 2);
-		let chan_3 = create_announced_chan_between_nodes(&nodes, 2, 3);
-
-		// Rebalance the network a bit by relaying one payment through all the channels...
-		send_payment(&nodes[0], &vec!(&nodes[1], &nodes[2], &nodes[3])[..], 8000000);
-		send_payment(&nodes[0], &vec!(&nodes[1], &nodes[2], &nodes[3])[..], 8000000);
-		send_payment(&nodes[0], &vec!(&nodes[1], &nodes[2], &nodes[3])[..], 8000000);
-
-		let (payment_preimage, payment_hash) = route_payment(&nodes[0], &vec!(&nodes[1], &nodes[2], &nodes[3]), 3000000);
-
-		// broadcast legit commitment tx from D on C's chain
-		let commitment_tx = nodes[3].node.channel_state.lock().unwrap().by_id.get(&chan_3.2).unwrap().last_local_commitment_txn.clone();
-		let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42};
-
-		// broadcast timeout tx on received
-		nodes[2].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![commitment_tx[0].clone()]}, 1);
-		test_txn_broadcast(&nodes[2], &chan_3, Some(commitment_tx[0].clone()), HTLCType::TIMEOUT);
-		let events = nodes[2].node.get_and_clear_pending_events();
-		assert_eq!(events.len(), 1); //should be an UpdateFailHTLC event, verify it
-
-		let commitment_tx = nodes[1].node.channel_state.lock().unwrap().by_id.get(&chan_2.2).unwrap().last_local_commitment_txn.clone();
-		let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42};
-		nodes[1].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![commitment_tx[0].clone()]}, 200);
-		let node_txn = test_txn_broadcast(&nodes[1], &chan_3, Some(commitment_tx[0].clone()), HTLCType::TIMEOUT);
-		let events = nodes[1].node.get_and_clear_pending_events();
-		assert_eq!(events.len(), 1); //should be an UpdateFailHTLC event, verify it
-
-
-		//assert!(nodes[0].node.handle_update_fail_htlc(&nodes[1].node.get_our_node_id(), &events[0].updates.update_fulfill_htlcs[0]).is_ok());
-	}
-
-	#[test]
 	fn test_htlc_ignore_latest_remote_commitment() {
 		// Test that HTLC transactions spending the latest remote commitment transaction are simply
 		// ignored if we cannot claim them. This originally tickled an invalid unwrap().