Don't try to sign a revoked tx in test_data_loss_protect

Author: devrandom

lightning/src/ln/functional_test_utils.rs

@@ -121,11 +121,12 @@ pub struct Node<'a, 'b: 'a, 'c: 'b> {
 	pub network_payment_count: Rc<RefCell<u8>>,
 	pub network_chan_count: Rc<RefCell<u32>>,
 	pub logger: &'c test_utils::TestLogger,
+	pub is_failed: bool,
 }
 
 impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> {
 	fn drop(&mut self) {
-		if !::std::thread::panicking() {
+		if !::std::thread::panicking() && !self.is_failed {
 			// Check that we processed all pending events
 			assert!(self.node.get_and_clear_pending_msg_events().is_empty());
 			assert!(self.node.get_and_clear_pending_events().is_empty());
@@ -1180,7 +1181,7 @@ pub fn create_network<'a, 'b: 'a, 'c: 'b>(node_count: usize, cfgs: &'b Vec<NodeC
 		                 tx_broadcaster: cfgs[i].tx_broadcaster, chain_monitor: &cfgs[i].chain_monitor,
 		                 keys_manager: &cfgs[i].keys_manager, node: &chan_mgrs[i], net_graph_msg_handler,
 		                 node_seed: cfgs[i].node_seed, network_chan_count: chan_count.clone(),
-		                 network_payment_count: payment_count.clone(), logger: cfgs[i].logger,
+		                 network_payment_count: payment_count.clone(), logger: cfgs[i].logger, is_failed: false
 		})
 	}
 

lightning/src/ln/functional_tests.rs

@@ -7475,6 +7475,9 @@ fn test_data_loss_protect() {
 	let spend_txn = check_spendable_outputs!(nodes[0], 1, node_cfgs[0].keys_manager, 100000);
 	assert_eq!(spend_txn.len(), 1);
 	check_spends!(spend_txn[0], node_txn[0]);
+
+	// Mark node as failed so we don't execute Node::drop and panic trying to sign a revoked tx
+	nodes[0].is_failed = true;
 }
 
 #[test]