f Hmpf, Option<BlockHash> for now :(

Author: tnull

lightning/src/chain/chainmonitor.rs

@@ -544,7 +544,7 @@ where
 		});
 	}
 
-	fn get_relevant_txids(&self) -> Vec<(Txid, BlockHash)> {
+	fn get_relevant_txids(&self) -> Vec<(Txid, Option<BlockHash>)> {
 		let mut txids = Vec::new();
 		let monitor_states = self.monitors.read().unwrap();
 		for monitor_state in monitor_states.values() {

lightning/src/chain/channelmonitor.rs

@@ -1486,11 +1486,11 @@ impl<Signer: Sign> ChannelMonitor<Signer> {
 	}
 
 	/// Returns the set of txids that should be monitored for re-organization out of the chain.
-	pub fn get_relevant_txids(&self) -> Vec<(Txid, BlockHash)> {
+	pub fn get_relevant_txids(&self) -> Vec<(Txid, Option<BlockHash>)> {
 		let inner = self.inner.lock().unwrap();
-		let mut txids: Vec<(Txid, BlockHash)> = inner.onchain_events_awaiting_threshold_conf
+		let mut txids: Vec<(Txid, Option<BlockHash>)> = inner.onchain_events_awaiting_threshold_conf
 			.iter()
-			.map(|entry| (entry.txid, entry.block_hash.unwrap()))
+			.map(|entry| (entry.txid, entry.block_hash))
 			.chain(inner.onchain_tx_handler.get_relevant_txids().into_iter())
 			.collect();
 		txids.sort_unstable();
@@ -3541,7 +3541,7 @@ where
 		self.0.best_block_updated(header, height, &*self.1, &*self.2, &*self.3);
 	}
 
-	fn get_relevant_txids(&self) -> Vec<(Txid, BlockHash)> {
+	fn get_relevant_txids(&self) -> Vec<(Txid, Option<BlockHash>)> {
 		self.0.get_relevant_txids()
 	}
 }

lightning/src/chain/mod.rs

@@ -185,7 +185,7 @@ pub trait Confirm {
 	///
 	/// [`transactions_confirmed`]: Self::transactions_confirmed
 	/// [`transaction_unconfirmed`]: Self::transaction_unconfirmed
-	fn get_relevant_txids(&self) -> Vec<(Txid, BlockHash)>;
+	fn get_relevant_txids(&self) -> Vec<(Txid, Option<BlockHash>)>;
 }
 
 /// An enum representing the status of a channel monitor update persistence.

lightning/src/chain/onchaintx.rs

@@ -866,10 +866,10 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 		self.claimable_outpoints.get(outpoint).is_some()
 	}
 
-	pub(crate) fn get_relevant_txids(&self) -> Vec<(Txid, BlockHash)> {
-		let mut txids: Vec<(Txid, BlockHash)> = self.onchain_events_awaiting_threshold_conf
+	pub(crate) fn get_relevant_txids(&self) -> Vec<(Txid, Option<BlockHash>)> {
+		let mut txids: Vec<(Txid, Option<BlockHash>)> = self.onchain_events_awaiting_threshold_conf
 			.iter()
-			.map(|entry| (entry.txid, entry.block_hash.unwrap()))
+			.map(|entry| (entry.txid, entry.block_hash))
 			.collect();
 		txids.sort_unstable_by_key(|tuple| tuple.0);
 		txids.dedup();

lightning/src/ln/channelmanager.rs

@@ -5853,11 +5853,11 @@ where
 		});
 	}
 
-	fn get_relevant_txids(&self) -> Vec<(Txid, BlockHash)> {
+	fn get_relevant_txids(&self) -> Vec<(Txid, Option<BlockHash>)> {
 		let channel_state = self.channel_state.lock().unwrap();
 		let mut res = Vec::with_capacity(channel_state.short_to_chan_info.len());
 		for chan in channel_state.by_id.values() {
-			if let (Some(funding_txo), Some(block_hash)) = (chan.get_funding_txo(), chan.get_funding_tx_confirmed_in()) {
+			if let (Some(funding_txo), block_hash) = (chan.get_funding_txo(), chan.get_funding_tx_confirmed_in()) {
 				res.push((funding_txo.txid, block_hash));
 			}
 		}