f move unwrap to channel.rs, where we have more state info

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -6401,7 +6401,7 @@ where
 		Ok((closing_transaction, total_fee_satoshis))
 	}
 
-	fn funding_outpoint(&self) -> OutPoint {
+	pub fn funding_outpoint(&self) -> OutPoint {
 		self.funding.channel_transaction_parameters.funding_outpoint.unwrap()
 	}
 

lightning/src/ln/channelmanager.rs

@@ -12605,7 +12605,7 @@ where
 				if let hash_map::Entry::Occupied(mut chan_entry) = peer_state.channel_by_id.entry(
 					channel_id) {
 					if let Some(chan) = chan_entry.get_mut().as_funded_mut() {
-						let channel_funding_outpoint = chan.funding.get_funding_txo().unwrap();
+						let channel_funding_outpoint = chan.funding_outpoint();
 						if let Some((monitor_update, further_update_exists)) = chan.unblock_next_blocked_monitor_update() {
 							log_debug!(logger, "Unlocking monitor updating for channel {} and updating monitor",
 								channel_id);