the different rust versions are a balancing act, and I can't juggle

Author: arik-so

lightning/src/ln/peer_handler.rs

@@ -467,13 +467,14 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 					while peer.pending_read_buffer.len() > 0 {
 
 						let mut conduit_option = None;
+						let mut remote_pubkey_option = None;
 
 						if let &mut PeerState::Handshake(ref mut handshake) = &mut peer.encryptor {
 							let (response, conduit, remote_pubkey) = handshake.process_act(&peer.pending_read_buffer, None).unwrap();
 							peer.pending_read_buffer.drain(..); // we read it all
 
 							if let Some(key) = remote_pubkey {
-								peer.their_node_id.replace(key);
+								remote_pubkey_option = Some(key);
 							}
 
 							peer.pending_outbound_buffer.push_back(response);
@@ -482,6 +483,10 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 							}
 						}
 
+						if let Some(key) = remote_pubkey_option {
+							peer.their_node_id = Some(key);
+						}
+
 						if let Some(conduit) = conduit_option {
 							// Rust 1.22 does not allow assignment in a borrowed context, even if mutable
 							peer.encryptor = PeerState::Connected(conduit);