improve error messaging

Author: arik-so

lightning/src/ln/peer_handler.rs

@@ -285,7 +285,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 		if peers.peers.insert(descriptor, Peer {
 			encryptor: PeerState::Handshake(handshake),
 			outbound: true,
-			their_node_id: None,
+			their_node_id: Some(their_node_id.clone()),
 			their_features: None,
 
 			pending_outbound_buffer: LinkedList::new(),
@@ -313,7 +313,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 	/// Panics if descriptor is duplicative with some other descriptor which has not yet has a
 	/// disconnect_event.
 	pub fn new_inbound_connection(&self, descriptor: Descriptor) -> Result<(), PeerHandleError> {
-		let handshake = PeerHandshake::new(&self.our_node_secret, &self.get_ephemeral_key());
+		let mut handshake = PeerHandshake::new(&self.our_node_secret, &self.get_ephemeral_key());
+		handshake.make_inbound();
 
 		let mut peers = self.peers.lock().unwrap();
 		if peers.peers.insert(descriptor, Peer {
@@ -465,28 +466,16 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 					peer.pending_read_buffer.extend_from_slice(&data);
 					while peer.pending_read_buffer.len() > 0 {
 
-						macro_rules! insert_node_id {
-							() => {
-								match peers.node_id_to_descriptor.entry(peer.their_node_id.unwrap()) {
-									hash_map::Entry::Occupied(_) => {
-										log_trace!(self, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap()));
-										peer.their_node_id = None; // Unset so that we don't generate a peer_disconnected event
-										return Err(PeerHandleError{ no_connection_possible: false })
-									},
-									hash_map::Entry::Vacant(entry) => {
-										log_trace!(self, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap()));
-										entry.insert(peer_descriptor.clone())
-									},
-								};
-							}
-						}
-
 						let mut conduit_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);
+							}
+
 							peer.pending_outbound_buffer.push_back(response);
 							if let Some(conduit) = conduit {
 								conduit_option = Some(conduit);

lightning/src/ln/peers/handshake/mod.rs

@@ -81,7 +81,7 @@ impl PeerHandshake {
 
 		match &self.state {
 			&Some(HandshakeState::Blank) => {
-				let remote_public_key = remote_public_key.ok_or("Call make_initiator() first")?;
+				let remote_public_key = remote_public_key.ok_or("remote_public_key must be Some for outbound connections")?;
 				let act_one = self.initiate(&remote_public_key)?;
 				response = act_one.0.to_vec();
 			}