f drop Channel::block_disconnected

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -7,7 +7,6 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
-use bitcoin::blockdata::block::BlockHeader;
 use bitcoin::blockdata::script::{Script,Builder};
 use bitcoin::blockdata::transaction::{TxIn, TxOut, Transaction, SigHashType};
 use bitcoin::blockdata::opcodes;
@@ -3625,16 +3624,6 @@ impl<Signer: Sign> Channel<Signer> {
 		Ok((None, timed_out_htlcs))
 	}
 
-	/// Called by channelmanager based on chain blocks being disconnected.
-	/// Returns true if we need to close the channel now due to funding transaction
-	/// unconfirmation/reorg.
-	pub fn block_disconnected(&mut self, header: &BlockHeader, new_height: u32) -> bool {
-		if self.update_best_block(new_height, header.time).is_err() {
-			return true;
-		}
-		false
-	}
-
 	// Methods to get unprompted messages to send to the remote end (or where we already returned
 	// something in the handler for the message that prompted this message):
 

lightning/src/ln/channelmanager.rs

@@ -3390,7 +3390,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 			let short_to_id = &mut channel_state.short_to_id;
 			let pending_msg_events = &mut channel_state.pending_msg_events;
 			channel_state.by_id.retain(|_,  v| {
-				if v.block_disconnected(header, new_height) {
+				if let Err(err_msg) = v.update_best_block(new_height, header.time) {
 					if let Some(short_id) = v.get_short_channel_id() {
 						short_to_id.remove(&short_id);
 					}
@@ -3400,6 +3400,10 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 							msg: update
 						});
 					}
+					pending_msg_events.push(events::MessageSendEvent::HandleError {
+						node_id: v.get_counterparty_node_id(),
+						action: msgs::ErrorAction::SendErrorMessage { msg: err_msg },
+					});
 					false
 				} else {
 					true