Skip to content

Commit 42dda54

Browse files
committed
f Pull out res from try_potential_handlerror
1 parent 0fa2156 commit 42dda54

File tree

1 file changed

+13
-20
lines changed

1 file changed

+13
-20
lines changed

lightning/src/ln/peer_handler.rs

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1554,22 +1554,21 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
15541554
let next_step = peer.channel_encryptor.get_noise_step();
15551555
match next_step {
15561556
NextNoiseStep::ActOne => {
1557-
let act_two = try_potential_handleerror!(
1558-
peer,
1559-
peer.channel_encryptor.process_act_one_with_keys(&peer.pending_read_buffer[..],
1557+
let res = peer.channel_encryptor.process_act_one_with_keys(
1558+
&peer.pending_read_buffer[..],
15601559
&self.node_signer,
15611560
self.get_ephemeral_key(),
15621561
&self.secp_ctx
1563-
)).to_vec();
1562+
);
1563+
let act_two = try_potential_handleerror!(peer, res).to_vec();
15641564
peer.pending_outbound_buffer.push_back(act_two);
15651565
peer.pending_read_buffer = [0; 66].to_vec(); // act three is 66 bytes long
15661566
},
15671567
NextNoiseStep::ActTwo => {
1568-
let (act_three, their_node_id) = try_potential_handleerror!(
1569-
peer,
1570-
peer.channel_encryptor.process_act_two(&peer.pending_read_buffer[..],
1568+
let res = peer.channel_encryptor.process_act_two(&peer.pending_read_buffer[..],
15711569
&self.node_signer
1572-
));
1570+
);
1571+
let (act_three, their_node_id) = try_potential_handleerror!(peer, res);
15731572
peer.pending_outbound_buffer.push_back(act_three.to_vec());
15741573
peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
15751574
peer.pending_read_is_header = true;
@@ -1582,10 +1581,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
15821581
self.enqueue_message(peer, &resp);
15831582
},
15841583
NextNoiseStep::ActThree => {
1585-
let their_node_id = try_potential_handleerror!(
1586-
peer,
1587-
peer.channel_encryptor.process_act_three(&peer.pending_read_buffer[..])
1588-
);
1584+
let res = peer.channel_encryptor.process_act_three(&peer.pending_read_buffer[..]);
1585+
let their_node_id = try_potential_handleerror!(peer, res);
15891586
peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
15901587
peer.pending_read_is_header = true;
15911588
peer.set_their_node_id(their_node_id);
@@ -1597,10 +1594,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
15971594
},
15981595
NextNoiseStep::NoiseComplete => {
15991596
if peer.pending_read_is_header {
1600-
let msg_len = try_potential_handleerror!(
1601-
peer,
1602-
peer.channel_encryptor.decrypt_length_header(&peer.pending_read_buffer[..])
1603-
);
1597+
let res = peer.channel_encryptor.decrypt_length_header(&peer.pending_read_buffer[..]);
1598+
let msg_len = try_potential_handleerror!(peer, res);
16041599
if peer.pending_read_buffer.capacity() > 8192 { peer.pending_read_buffer = Vec::new(); }
16051600
peer.pending_read_buffer.resize(msg_len as usize + 16, 0);
16061601
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
16091604
peer.pending_read_is_header = false;
16101605
} else {
16111606
debug_assert!(peer.pending_read_buffer.len() >= 2 + 16);
1612-
try_potential_handleerror!(
1613-
peer,
1614-
peer.channel_encryptor.decrypt_message(&mut peer.pending_read_buffer[..])
1615-
);
1607+
let res = peer.channel_encryptor.decrypt_message(&mut peer.pending_read_buffer[..]);
1608+
try_potential_handleerror!(peer, res);
16161609

16171610
let message_result = wire::read(
16181611
&mut &peer.pending_read_buffer[..peer.pending_read_buffer.len() - 16],

0 commit comments

Comments
 (0)