Fix claim_htlc_output_shared_tx test for fixed monitoring

Author: TheBlueMatt

src/ln/channelmanager.rs

@@ -2284,7 +2284,7 @@ mod tests {
 	use rand::{thread_rng,Rng};
 
 	use std::cell::RefCell;
-	use std::collections::HashMap;
+	use std::collections::{BTreeSet, HashMap};
 	use std::default::Default;
 	use std::rc::Rc;
 	use std::sync::{Arc, Mutex};
@@ -3496,7 +3496,6 @@ mod tests {
 	#[test]
 	fn claim_htlc_outputs_shared_tx() {
 		// Node revoked old state, htlcs haven't time out yet, claim them in shared justice tx
-
 		let nodes = create_network(2);
 
 		// Create some new channel:
@@ -3510,6 +3509,9 @@ mod tests {
 
 		// Get the will-be-revoked local txn from node[0]
 		let revoked_local_txn = nodes[0].node.channel_state.lock().unwrap().by_id.get(&chan_1.2).unwrap().last_local_commitment_txn.clone();
+		assert_eq!(revoked_local_txn.len(), 2); // commitment tx + 1 HTLC-Timeout tx
+		assert_eq!(revoked_local_txn[0].input.len(), 1);
+		assert_eq!(revoked_local_txn[0].input[0].previous_output.txid, chan_1.3.txid());
 
 		//Revoke the old state
 		claim_payment(&nodes[0], &vec!(&nodes[1])[..], payment_preimage_1);
@@ -3526,32 +3528,29 @@ mod tests {
 			let mut revoked_tx_map = HashMap::new();
 			revoked_tx_map.insert(revoked_local_txn[0].txid(), revoked_local_txn[0].clone());
 
-			assert_eq!(node_txn[0].input.len(), 2);
+			assert_eq!(node_txn[0].input.len(), 3); // Claim the revoked output + both revoked HTLC outputs
 			node_txn[0].verify(&revoked_tx_map).unwrap();
-
-			assert_eq!(node_txn[3].input.len(), 2);
-			node_txn[3].verify(&revoked_tx_map).unwrap();
-
-			assert_eq!(node_txn[0].txid(), node_txn[3].txid()); // justice tx is duplicated due to block re-scanning
-
-			let witness_script_1 = node_txn[0].clone().input[0].witness.pop().unwrap();
-			let witness_script_2 = node_txn[0].clone().input[1].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);
-			}
-
+			assert_eq!(node_txn[0], node_txn[3]); // justice tx is duplicated due to block re-scanning
+
+			let mut witness_lens = BTreeSet::new();
+			witness_lens.insert(node_txn[0].input[0].witness.clone().pop().unwrap().len());
+			witness_lens.insert(node_txn[0].input[1].witness.clone().pop().unwrap().len());
+			witness_lens.insert(node_txn[0].input[2].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
+
+			// Next nodes[1] broadcasts its current local tx state:
 			assert_eq!(node_txn[1].input.len(), 1);
-			let witness_script = node_txn[1].clone().input[0].witness.pop().unwrap();
-			assert_eq!(witness_script.len(), 71); // Spending funding tx unique txoutput, tx broadcasted by ChannelManager
+			assert_eq!(node_txn[1].input[0].previous_output.txid, chan_1.3.txid()); //Spending funding tx unique txouput, tx broadcasted by ChannelManager
 
 			assert_eq!(node_txn[2].input.len(), 1);
 			let witness_script = node_txn[2].clone().input[0].witness.pop().unwrap();
-			assert_eq!(witness_script.len(), 133); //Spending a offered htlc output
-
+			assert_eq!(witness_script.len(), 133); //Spending an offered htlc output
+			assert_eq!(node_txn[2].input[0].previous_output.txid, node_txn[1].txid());
+			assert_ne!(node_txn[2].input[0].previous_output.txid, node_txn[0].input[0].previous_output.txid);
+			assert_ne!(node_txn[2].input[0].previous_output.txid, node_txn[0].input[1].previous_output.txid);
 		}
 		get_announce_close_broadcast_events(&nodes, 0, 1);
 		assert_eq!(nodes[0].node.list_channels().len(), 0);