f Pull out res from try_potential_handlerror

Author: tnull

lightning/src/ln/peer_handler.rs

@@ -1554,22 +1554,21 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 					let next_step = peer.channel_encryptor.get_noise_step();
 					match next_step {
 						NextNoiseStep::ActOne => {
-							let act_two = try_potential_handleerror!(
-								peer,
-								peer.channel_encryptor.process_act_one_with_keys(&peer.pending_read_buffer[..],
+							let res = peer.channel_encryptor.process_act_one_with_keys(
+								&peer.pending_read_buffer[..],
 								&self.node_signer,
 								self.get_ephemeral_key(),
 								&self.secp_ctx
-							)).to_vec();
+							);
+							let act_two = try_potential_handleerror!(peer, res).to_vec();
 							peer.pending_outbound_buffer.push_back(act_two);
 							peer.pending_read_buffer = [0; 66].to_vec(); // act three is 66 bytes long
 						},
 						NextNoiseStep::ActTwo => {
-							let (act_three, their_node_id) = try_potential_handleerror!(
-								peer,
-								peer.channel_encryptor.process_act_two(&peer.pending_read_buffer[..],
+							let res = peer.channel_encryptor.process_act_two(&peer.pending_read_buffer[..],
 								&self.node_signer
-							));
+							);
+							let (act_three, their_node_id) = try_potential_handleerror!(peer, res);
 							peer.pending_outbound_buffer.push_back(act_three.to_vec());
 							peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 							peer.pending_read_is_header = true;
@@ -1582,10 +1581,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 							self.enqueue_message(peer, &resp);
 						},
 						NextNoiseStep::ActThree => {
-							let their_node_id = try_potential_handleerror!(
-								peer,
-								peer.channel_encryptor.process_act_three(&peer.pending_read_buffer[..])
-							);
+							let res = peer.channel_encryptor.process_act_three(&peer.pending_read_buffer[..]);
+							let their_node_id = try_potential_handleerror!(peer, res);
 							peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
 							peer.pending_read_is_header = true;
 							peer.set_their_node_id(their_node_id);
@@ -1597,10 +1594,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 						},
 						NextNoiseStep::NoiseComplete => {
 							if peer.pending_read_is_header {
-								let msg_len = try_potential_handleerror!(
-									peer,
-									peer.channel_encryptor.decrypt_length_header(&peer.pending_read_buffer[..])
-								);
+								let res = peer.channel_encryptor.decrypt_length_header(&peer.pending_read_buffer[..]);
+								let msg_len = try_potential_handleerror!(peer, res);
 								if peer.pending_read_buffer.capacity() > 8192 { peer.pending_read_buffer = Vec::new(); }
 								peer.pending_read_buffer.resize(msg_len as usize + 16, 0);
 								if msg_len < 2 { // Need at least the message type tag
@@ -1609,10 +1604,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 								peer.pending_read_is_header = false;
 							} else {
 								debug_assert!(peer.pending_read_buffer.len() >= 2 + 16);
-								try_potential_handleerror!(
-									peer,
-									peer.channel_encryptor.decrypt_message(&mut peer.pending_read_buffer[..])
-								);
+								let res = peer.channel_encryptor.decrypt_message(&mut peer.pending_read_buffer[..]);
+								try_potential_handleerror!(peer, res);
 
 								let message_result = wire::read(
 									&mut &peer.pending_read_buffer[..peer.pending_read_buffer.len() - 16],