f prefer to avoid unwraps

Author: TheBlueMatt

lightning/src/ln/peer_handler.rs

@@ -1665,13 +1665,16 @@ where
 
 	/// Append a message to a peer's pending outbound/write buffer
 	fn enqueue_message<M: wire::Type>(&self, peer: &mut Peer, message: &M) {
-		// `unwrap` SAFETY: `their_node_id` is guaranteed to be `Some` after the handshake
-		let node_id = peer.their_node_id.unwrap().0;
-		let logger = WithContext::from(&self.logger, Some(node_id), None, None);
-		if is_gossip_msg(message.type_id()) {
-			log_gossip!(logger, "Enqueueing message {:?} to {}", message, log_pubkey!(node_id));
+		let their_node_id = peer.their_node_id.map(|p| p.0);
+		if let Some(node_id) = their_node_id {
+			let logger = WithContext::from(&self.logger, their_node_id, None, None);
+			if is_gossip_msg(message.type_id()) {
+				log_gossip!(logger, "Enqueueing message {:?} to {}", message, log_pubkey!(node_id));
+			} else {
+				log_trace!(logger, "Enqueueing message {:?} to {}", message, log_pubkey!(node_id));
+			}
 		} else {
-			log_trace!(logger, "Enqueueing message {:?} to {}", message, log_pubkey!(node_id));
+			debug_assert!(false, "node_id should be set by the time we send a message");
 		}
 		peer.msgs_sent_since_pong += 1;
 		peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(message));
@@ -1774,7 +1777,12 @@ where
 
 					macro_rules! insert_node_id {
 						() => {
-							let their_node_id = peer.their_node_id.unwrap().0;
+							let their_node_id = if let Some((node_id, _)) = peer.their_node_id {
+								node_id
+							} else {
+								debug_assert!(false, "Should have a node_id to insert");
+								return Err(PeerHandleError {});
+							};
 							let logger = WithContext::from(&self.logger, Some(their_node_id), None, None);
 							match self.node_id_to_descriptor.lock().unwrap().entry(their_node_id) {
 								hash_map::Entry::Occupied(e) => {