f unwrap the whole thing

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -2203,9 +2203,9 @@ impl<Signer: Sign> Channel<Signer> {
 				} else {
 					// If they have sent updated points, funding_locked is always supposed to match
 					// their "first" point, which we re-derive here.
-					self.commitment_secrets.get_secret(INITIAL_COMMITMENT_NUMBER - 1)
-						.map(|secret| SecretKey::from_slice(&secret).ok()).flatten()
-						.map(|sk| PublicKey::from_secret_key(&self.secp_ctx, &sk))
+					Some(PublicKey::from_secret_key(&self.secp_ctx, &SecretKey::from_slice(
+							&self.commitment_secrets.get_secret(INITIAL_COMMITMENT_NUMBER - 1).expect("We should have all prev secrets available")
+						).expect("We already advanced, so previous secret keys should have been validated already")))
 				};
 			if expected_point != Some(msg.next_per_commitment_point) {
 				return Err(ChannelError::Close("Peer sent a reconnect funding_locked with a different point".to_owned()));