resolve merge conflicts

Author: arik-so

lightning/src/ln/peer_handler.rs

@@ -108,16 +108,15 @@ enum InitSyncTracker{
 }
 
 enum PeerState {
-	Handshake(PeerHandshake),
+	Authenticating(PeerHandshake),
 	Connected(Conduit),
 }
 
 impl PeerState {
 	fn is_ready_for_encryption(&self) -> bool {
-		if let &PeerState::Connected(_) = self {
-			true
-		} else {
-			false
+		match self {
+			&PeerState::Connected(_) => true,
+			_ => false
 		}
 	}
 }
@@ -283,7 +282,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 
 		let mut peers = self.peers.lock().unwrap();
 		if peers.peers.insert(descriptor, Peer {
-			encryptor: PeerState::Handshake(handshake),
+			encryptor: PeerState::Authenticating(handshake),
 			outbound: true,
 			their_node_id: Some(their_node_id.clone()),
 			their_features: None,
@@ -318,7 +317,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 
 		let mut peers = self.peers.lock().unwrap();
 		if peers.peers.insert(descriptor, Peer {
-			encryptor: PeerState::Handshake(handshake),
+			encryptor: PeerState::Authenticating(handshake),
 			outbound: false,
 			their_node_id: None,
 			their_features: None,
@@ -469,9 +468,9 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 						let mut conduit_option = None;
 						let mut remote_pubkey_option = None;
 
-						if let &mut PeerState::Handshake(ref mut handshake) = &mut peer.encryptor {
+						if let &mut PeerState::Authenticating(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
+							peer.pending_read_buffer = Vec::new(); // empty the pending read buffer
 
 							if let Some(key) = remote_pubkey {
 								remote_pubkey_option = Some(key);
@@ -543,18 +542,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 								}
 							}
 
-							let next_message_result = conduit.decrypt(&peer.pending_read_buffer);
-
-							let offset = next_message_result.1;
-							if offset == 0 {
-								// nothing got read
-								break;
+							let message_option = conduit.decrypt_single_message(Some(&peer.pending_read_buffer));
+							let msg_data = if let Some(message) = message_option {
+								message
 							} else {
-								peer.pending_read_buffer.drain(0..offset);
-							}
-
-							// something got read, so we definitely have a message
-							let msg_data = next_message_result.0.unwrap();
+								break;
+							};
 
 							{
 								{