Special case 0-conf in check_funding_meets_minimum_depth

0-conf channels always meet the funding minimum depth once accepted.
Special case this in check_funding_meets_minimum_depth such that it
isn't implicit in later calculations. Since a minimum depth is always
set when the channel is accepted, expect this to be the case in the
method since it should only be called on a ChannelContext in a
FundedChannel.

Author: jkczyz

lightning/src/ln/channel.rs

@@ -5272,14 +5272,21 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 	}
 
 	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
-		let minimum_depth = funding.minimum_depth_override.or(self.minimum_depth);
+		let minimum_depth = funding.minimum_depth_override
+			.or(self.minimum_depth)
+			.expect("ChannelContext::minimum_depth should be set for FundedChannel");
 
-		if funding.funding_tx_confirmation_height == 0 && minimum_depth != Some(0) {
+		// Zero-conf channels always meet the minimum depth.
+		if minimum_depth == 0 {
+			return true;
+		}
+
+		if funding.funding_tx_confirmation_height == 0 {
 			return false;
 		}
 
 		let funding_tx_confirmations = height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
-		if funding_tx_confirmations < minimum_depth.unwrap_or(0) as i64 {
+		if funding_tx_confirmations < minimum_depth as i64 {
 			return false;
 		}