Fix claim_htlc_outputs_single_tx for fixed monitoring

Author: TheBlueMatt

src/ln/channelmanager.rs

@@ -3584,44 +3584,46 @@ mod tests {
 
 			nodes[1].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![revoked_local_txn[0].clone()] }, 200);
 			let node_txn = nodes[1].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.len(), 12); // ChannelManager : 2, ChannelMontitor: 8 (1 standard revoked output, 2 revocation htlc tx, 1 local commitment tx + 1 htlc timeout tx) * 2 (block-rescan)
 
-			assert_eq!(node_txn[0], node_txn[6]);
-			assert_eq!(node_txn[1], node_txn[7]);
-			assert_eq!(node_txn[2], node_txn[8]);
-			assert_eq!(node_txn[3], node_txn[9]);
-			assert_eq!(node_txn[2], node_txn[4]); //local commitment tx + htlc timeout tx broadcated by ChannelManger
-			assert_eq!(node_txn[3], node_txn[5]);
+			assert_eq!(node_txn[0], node_txn[7]);
+			assert_eq!(node_txn[1], node_txn[8]);
+			assert_eq!(node_txn[2], node_txn[9]);
+			assert_eq!(node_txn[3], node_txn[10]);
+			assert_eq!(node_txn[4], node_txn[11]);
+			assert_eq!(node_txn[3], node_txn[5]); //local commitment tx + htlc timeout tx broadcated by ChannelManger
+			assert_eq!(node_txn[4], node_txn[6]);
 
 			assert_eq!(node_txn[0].input.len(), 1);
 			assert_eq!(node_txn[1].input.len(), 1);
+			assert_eq!(node_txn[2].input.len(), 1);
 
 			let mut revoked_tx_map = HashMap::new();
 			revoked_tx_map.insert(revoked_local_txn[0].txid(), revoked_local_txn[0].clone());
 			node_txn[0].verify(&revoked_tx_map).unwrap();
 			node_txn[1].verify(&revoked_tx_map).unwrap();
+			node_txn[2].verify(&revoked_tx_map).unwrap();
 
-			let witness_script_1 = node_txn[0].clone().input[0].witness.pop().unwrap();
-			let witness_script_2 = node_txn[1].clone().input[0].witness.pop().unwrap();
-			if witness_script_1.len() > 133 {
-				assert_eq!(witness_script_1.len(), 138);
-				assert_eq!(witness_script_2.len(), 133);
-			} else {
-				assert_eq!(witness_script_1.len(), 133);
-				assert_eq!(witness_script_2.len(), 138);
-			}
+			let mut witness_lens = BTreeSet::new();
+			witness_lens.insert(node_txn[0].input[0].witness.clone().pop().unwrap().len());
+			witness_lens.insert(node_txn[1].input[0].witness.clone().pop().unwrap().len());
+			witness_lens.insert(node_txn[2].input[0].witness.clone().pop().unwrap().len());
+			assert_eq!(witness_lens.len(), 3);
+			assert_eq!(*witness_lens.iter().skip(0).next().unwrap(), 77); // revoked to_local
+			assert_eq!(*witness_lens.iter().skip(1).next().unwrap(), 133); // revoked offered HTLC
+			assert_eq!(*witness_lens.iter().skip(2).next().unwrap(), 138); // revoked received HTLC
 
 			let mut funding_tx_map = HashMap::new();
 			funding_tx_map.insert(chan_1.3.txid(), chan_1.3.clone());
-			node_txn[2].verify(&funding_tx_map).unwrap();
-			assert_eq!(node_txn[2].input.len(), 1);
-
+			node_txn[3].verify(&funding_tx_map).unwrap();
 			assert_eq!(node_txn[3].input.len(), 1);
-			let witness_script = node_txn[3].clone().input[0].witness.pop().unwrap();
+
+			assert_eq!(node_txn[4].input.len(), 1);
+			let witness_script = node_txn[4].input[0].witness.clone().pop().unwrap();
 			assert_eq!(witness_script.len(), 133); //Spending an offered htlc output
-			assert_eq!(node_txn[3].input[0].previous_output.txid, node_txn[2].txid());
-			assert_ne!(node_txn[3].input[0].previous_output.txid, node_txn[0].input[0].previous_output.txid);
-			assert_ne!(node_txn[3].input[0].previous_output.txid, node_txn[1].input[0].previous_output.txid);
+			assert_eq!(node_txn[4].input[0].previous_output.txid, node_txn[3].txid());
+			assert_ne!(node_txn[4].input[0].previous_output.txid, node_txn[0].input[0].previous_output.txid);
+			assert_ne!(node_txn[4].input[0].previous_output.txid, node_txn[1].input[0].previous_output.txid);
 		}
 		get_announce_close_broadcast_events(&nodes, 0, 1);
 		assert_eq!(nodes[0].node.list_channels().len(), 0);