Skip to content

Commit d5d790d

Browse files
tnulltnull
committed
rustfmt: Prepare lightning-invoice/src/utils.rs 
1 parent de9f7a4 commit d5d790d

File tree

1 file changed

+36
-27
lines changed

1 file changed

+36
-27
lines changed

‎lightning-invoice/src/utils.rs

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,13 @@ where
150150
{
151151

152152
if phantom_route_hints.is_empty() {
153-
return Err(SignOrCreationError::CreationError(
154-
CreationError::MissingRouteHints,
155-
));
153+
let e = SignOrCreationError::CreationError(CreationError::MissingRouteHints);
154+
return Err(e);
156155
}
157156

158157
if min_final_cltv_expiry_delta.is_some() && min_final_cltv_expiry_delta.unwrap().saturating_add(3) < MIN_FINAL_CLTV_EXPIRY_DELTA {
159-
return Err(SignOrCreationError::CreationError(CreationError::MinFinalCltvExpiryDeltaTooShort));
158+
let e = SignOrCreationError::CreationError(CreationError::MinFinalCltvExpiryDeltaTooShort);
159+
return Err(e);
160160
}
161161

162162
let invoice = match description {
@@ -468,7 +468,8 @@ fn _create_invoice_from_channelmanager_and_duration_since_epoch<M: Deref, T: Der
468468
L::Target: Logger,
469469
{
470470
if min_final_cltv_expiry_delta.is_some() && min_final_cltv_expiry_delta.unwrap().saturating_add(3) < MIN_FINAL_CLTV_EXPIRY_DELTA {
471-
return Err(SignOrCreationError::CreationError(CreationError::MinFinalCltvExpiryDeltaTooShort));
471+
let e = SignOrCreationError::CreationError(CreationError::MinFinalCltvExpiryDeltaTooShort);
472+
return Err(e);
472473
}
473474

474475
// `create_inbound_payment` only returns an error if the amount is greater than the total bitcoin
@@ -534,7 +535,8 @@ fn _create_invoice_from_channelmanager_and_duration_since_epoch_with_payment_has
534535
let channels = channelmanager.list_channels();
535536

536537
if min_final_cltv_expiry_delta.is_some() && min_final_cltv_expiry_delta.unwrap().saturating_add(3) < MIN_FINAL_CLTV_EXPIRY_DELTA {
537-
return Err(SignOrCreationError::CreationError(CreationError::MinFinalCltvExpiryDeltaTooShort));
538+
let e = SignOrCreationError::CreationError(CreationError::MinFinalCltvExpiryDeltaTooShort);
539+
return Err(e);
538540
}
539541

540542
log_trace!(logger, "Creating invoice with payment hash {}", &payment_hash);
@@ -914,8 +916,9 @@ mod test {
914916
SendEvent::from_event(events.remove(0))
915917

916918
};
917-
nodes[1].node.handle_update_add_htlc(&nodes[0].node.get_our_node_id(), &payment_event.msgs[0]);
918-
nodes[1].node.handle_commitment_signed(&nodes[0].node.get_our_node_id(), &payment_event.commitment_msg);
919+
let node_id_0 = nodes[0].node.get_our_node_id();
920+
nodes[1].node.handle_update_add_htlc(&node_id_0, &payment_event.msgs[0]);
921+
nodes[1].node.handle_commitment_signed(&node_id_0, &payment_event.commitment_msg);
919922
let mut added_monitors = nodes[1].chain_monitor.added_monitors.lock().unwrap();
920923
assert_eq!(added_monitors.len(), 1);
921924
added_monitors.clear();
@@ -1019,22 +1022,25 @@ mod test {
10191022
// yet announced.
10201023
let pub_channel_scid = mine_transaction(&nodes[0], &conf_tx);
10211024
let node_a_pub_channel_ready = get_event_msg!(nodes[0], MessageSendEvent::SendChannelReady, nodes[1].node.get_our_node_id());
1022-
nodes[1].node.handle_channel_ready(&nodes[0].node.get_our_node_id(), &node_a_pub_channel_ready);
1025+
let node_id_0 = nodes[0].node.get_our_node_id();
1026+
nodes[1].node.handle_channel_ready(&node_id_0, &node_a_pub_channel_ready);
10231027

10241028
assert_eq!(mine_transaction(&nodes[1], &conf_tx), pub_channel_scid);
10251029
let events = nodes[1].node.get_and_clear_pending_msg_events();
10261030
assert_eq!(events.len(), 2);
1031+
let node_id_1 = nodes[1].node.get_our_node_id();
10271032
if let MessageSendEvent::SendChannelReady { msg, .. } = &events[0] {
1028-
nodes[0].node.handle_channel_ready(&nodes[1].node.get_our_node_id(), msg);
1033+
nodes[0].node.handle_channel_ready(&node_id_1, msg);
10291034
} else { panic!(); }
10301035
if let MessageSendEvent::SendChannelUpdate { msg, .. } = &events[1] {
1031-
nodes[0].node.handle_channel_update(&nodes[1].node.get_our_node_id(), msg);
1036+
nodes[0].node.handle_channel_update(&node_id_1, msg);
10321037
} else { panic!(); }
10331038

1034-
nodes[1].node.handle_channel_update(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendChannelUpdate, nodes[1].node.get_our_node_id()));
1039+
let chan_upd_msg = get_event_msg!(nodes[0], MessageSendEvent::SendChannelUpdate, node_id_1);
1040+
nodes[1].node.handle_channel_update(&node_id_0, &chan_upd_msg);
10351041

1036-
expect_channel_ready_event(&nodes[0], &nodes[1].node.get_our_node_id());
1037-
expect_channel_ready_event(&nodes[1], &nodes[0].node.get_our_node_id());
1042+
expect_channel_ready_event(&nodes[0], &node_id_1);
1043+
expect_channel_ready_event(&nodes[1], &node_id_0);
10381044

10391045
scid_aliases.clear();
10401046
scid_aliases.insert(node_a_pub_channel_ready.short_channel_id_alias.unwrap());
@@ -1048,7 +1054,7 @@ mod test {
10481054
connect_blocks(&nodes[1], 5);
10491055
match_invoice_routes(Some(5000), &nodes[1], scid_aliases.clone());
10501056
connect_blocks(&nodes[1], 1);
1051-
get_event_msg!(nodes[1], MessageSendEvent::SendAnnouncementSignatures, nodes[0].node.get_our_node_id());
1057+
get_event_msg!(nodes[1], MessageSendEvent::SendAnnouncementSignatures, node_id_0);
10521058
match_invoice_routes(Some(5000), &nodes[1], HashSet::new());
10531059
}
10541060

@@ -1169,11 +1175,13 @@ mod test {
11691175
// is never handled, the `channel.counterparty.forwarding_info` is never assigned.
11701176
let mut private_chan_cfg = UserConfig::default();
11711177
private_chan_cfg.channel_handshake_config.announced_channel = false;
1172-
let temporary_channel_id = nodes[2].node.create_channel(nodes[0].node.get_our_node_id(), 1_000_000, 500_000_000, 42, None, Some(private_chan_cfg)).unwrap();
1173-
let open_channel = get_event_msg!(nodes[2], MessageSendEvent::SendOpenChannel, nodes[0].node.get_our_node_id());
1174-
nodes[0].node.handle_open_channel(&nodes[2].node.get_our_node_id(), &open_channel);
1175-
let accept_channel = get_event_msg!(nodes[0], MessageSendEvent::SendAcceptChannel, nodes[2].node.get_our_node_id());
1176-
nodes[2].node.handle_accept_channel(&nodes[0].node.get_our_node_id(), &accept_channel);
1178+
let node_id_0 = nodes[0].node.get_our_node_id();
1179+
let node_id_2 = nodes[2].node.get_our_node_id();
1180+
let temporary_channel_id = nodes[2].node.create_channel(node_id_0, 1_000_000, 500_000_000, 42, None, Some(private_chan_cfg)).unwrap();
1181+
let open_channel = get_event_msg!(nodes[2], MessageSendEvent::SendOpenChannel, node_id_0);
1182+
nodes[0].node.handle_open_channel(&node_id_2, &open_channel);
1183+
let accept_channel = get_event_msg!(nodes[0], MessageSendEvent::SendAcceptChannel, node_id_2);
1184+
nodes[2].node.handle_accept_channel(&node_id_0, &accept_channel);
11771185

11781186
let tx = sign_funding_transaction(&nodes[2], &nodes[0], 1_000_000, temporary_channel_id);
11791187

@@ -1182,13 +1190,14 @@ mod test {
11821190
connect_blocks(&nodes[2], CHAN_CONFIRM_DEPTH - 1);
11831191
confirm_transaction_at(&nodes[0], &tx, conf_height);
11841192
connect_blocks(&nodes[0], CHAN_CONFIRM_DEPTH - 1);
1185-
let as_channel_ready = get_event_msg!(nodes[2], MessageSendEvent::SendChannelReady, nodes[0].node.get_our_node_id());
1186-
nodes[2].node.handle_channel_ready(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendChannelReady, nodes[2].node.get_our_node_id()));
1187-
get_event_msg!(nodes[2], MessageSendEvent::SendChannelUpdate, nodes[0].node.get_our_node_id());
1188-
nodes[0].node.handle_channel_ready(&nodes[2].node.get_our_node_id(), &as_channel_ready);
1189-
get_event_msg!(nodes[0], MessageSendEvent::SendChannelUpdate, nodes[2].node.get_our_node_id());
1190-
expect_channel_ready_event(&nodes[0], &nodes[2].node.get_our_node_id());
1191-
expect_channel_ready_event(&nodes[2], &nodes[0].node.get_our_node_id());
1193+
let as_chan_rdy = get_event_msg!(nodes[2], MessageSendEvent::SendChannelReady, node_id_0);
1194+
let chan_rdy_msg = get_event_msg!(nodes[0], MessageSendEvent::SendChannelReady, node_id_2);
1195+
nodes[2].node.handle_channel_ready(&node_id_0, &chan_rdy_msg);
1196+
get_event_msg!(nodes[2], MessageSendEvent::SendChannelUpdate, node_id_0);
1197+
nodes[0].node.handle_channel_ready(&node_id_2, &as_chan_rdy);
1198+
get_event_msg!(nodes[0], MessageSendEvent::SendChannelUpdate, node_id_2);
1199+
expect_channel_ready_event(&nodes[0], &node_id_2);
1200+
expect_channel_ready_event(&nodes[2], &node_id_0);
11921201

11931202
// As `msgs::ChannelUpdate` was never handled for the participating node(s) of the second
11941203
// channel, the channel will never be assigned any `counterparty.forwarding_info`.

0 commit comments

Comments
 (0)