Skip to content

Commit 437fa4f

Browse files
TheBlueMattTheBlueMatt
authored
Merge pull request #1959 from danielgranhao/stop-passing-init-features-in-msg-handlers
Stop passing `InitFeatures` in msg handlers
2 parents 7fefa00 + bcf1740 commit 437fa4f

File tree

15 files changed

+162
-163
lines changed

15 files changed

+162
-163
lines changed

‎fuzz/src/chanmon_consistency.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
482482
} else { panic!("Wrong event type"); }
483483
};
484484

485-
$dest.handle_open_channel(&$source.get_our_node_id(), $source.init_features(), &open_channel);
485+
$dest.handle_open_channel(&$source.get_our_node_id(), &open_channel);
486486
let accept_channel = {
487487
let events = $dest.get_and_clear_pending_msg_events();
488488
assert_eq!(events.len(), 1);
@@ -491,7 +491,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out) {
491491
} else { panic!("Wrong event type"); }
492492
};
493493

494-
$source.handle_accept_channel(&$dest.get_our_node_id(), $dest.init_features(), &accept_channel);
494+
$source.handle_accept_channel(&$dest.get_our_node_id(), &accept_channel);
495495
let funding_output;
496496
{
497497
let events = $source.get_and_clear_pending_events();

‎lightning-background-processor/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -783,8 +783,8 @@ mod tests {
783783
macro_rules! begin_open_channel {
784784
($node_a: expr, $node_b: expr, $channel_value: expr) => {{
785785
$node_a.node.create_channel($node_b.node.get_our_node_id(), $channel_value, 100, 42, None).unwrap();
786-
$node_b.node.handle_open_channel(&$node_a.node.get_our_node_id(), $node_a.node.init_features(), &get_event_msg!($node_a, MessageSendEvent::SendOpenChannel, $node_b.node.get_our_node_id()));
787-
$node_a.node.handle_accept_channel(&$node_b.node.get_our_node_id(), $node_b.node.init_features(), &get_event_msg!($node_b, MessageSendEvent::SendAcceptChannel, $node_a.node.get_our_node_id()));
786+
$node_b.node.handle_open_channel(&$node_a.node.get_our_node_id(), &get_event_msg!($node_a, MessageSendEvent::SendOpenChannel, $node_b.node.get_our_node_id()));
787+
$node_a.node.handle_accept_channel(&$node_b.node.get_our_node_id(), &get_event_msg!($node_b, MessageSendEvent::SendAcceptChannel, $node_a.node.get_our_node_id()));
788788
}}
789789
}
790790

‎lightning-invoice/src/utils.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -828,9 +828,9 @@ mod test {
828828
private_chan_cfg.channel_handshake_config.announced_channel = false;
829829
let temporary_channel_id = nodes[2].node.create_channel(nodes[0].node.get_our_node_id(), 1_000_000, 500_000_000, 42, Some(private_chan_cfg)).unwrap();
830830
let open_channel = get_event_msg!(nodes[2], MessageSendEvent::SendOpenChannel, nodes[0].node.get_our_node_id());
831-
nodes[0].node.handle_open_channel(&nodes[2].node.get_our_node_id(), nodes[2].node.init_features(), &open_channel);
831+
nodes[0].node.handle_open_channel(&nodes[2].node.get_our_node_id(), &open_channel);
832832
let accept_channel = get_event_msg!(nodes[0], MessageSendEvent::SendAcceptChannel, nodes[2].node.get_our_node_id());
833-
nodes[2].node.handle_accept_channel(&nodes[0].node.get_our_node_id(), nodes[0].node.init_features(), &accept_channel);
833+
nodes[2].node.handle_accept_channel(&nodes[0].node.get_our_node_id(), &accept_channel);
834834

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

@@ -1218,9 +1218,9 @@ mod test {
12181218
private_chan_cfg.channel_handshake_config.announced_channel = false;
12191219
let temporary_channel_id = nodes[1].node.create_channel(nodes[3].node.get_our_node_id(), 1_000_000, 500_000_000, 42, Some(private_chan_cfg)).unwrap();
12201220
let open_channel = get_event_msg!(nodes[1], MessageSendEvent::SendOpenChannel, nodes[3].node.get_our_node_id());
1221-
nodes[3].node.handle_open_channel(&nodes[1].node.get_our_node_id(), nodes[1].node.init_features(), &open_channel);
1221+
nodes[3].node.handle_open_channel(&nodes[1].node.get_our_node_id(), &open_channel);
12221222
let accept_channel = get_event_msg!(nodes[3], MessageSendEvent::SendAcceptChannel, nodes[1].node.get_our_node_id());
1223-
nodes[1].node.handle_accept_channel(&nodes[3].node.get_our_node_id(), nodes[3].node.init_features(), &accept_channel);
1223+
nodes[1].node.handle_accept_channel(&nodes[3].node.get_our_node_id(), &accept_channel);
12241224

12251225
let tx = sign_funding_transaction(&nodes[1], &nodes[3], 1_000_000, temporary_channel_id);
12261226

‎lightning-net-tokio/src/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -586,12 +586,12 @@ mod tests {
586586
fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::empty() }
587587
}
588588
impl ChannelMessageHandler for MsgHandler {
589-
fn handle_open_channel(&self, _their_node_id: &PublicKey, _their_features: InitFeatures, _msg: &OpenChannel) {}
590-
fn handle_accept_channel(&self, _their_node_id: &PublicKey, _their_features: InitFeatures, _msg: &AcceptChannel) {}
589+
fn handle_open_channel(&self, _their_node_id: &PublicKey, _msg: &OpenChannel) {}
590+
fn handle_accept_channel(&self, _their_node_id: &PublicKey, _msg: &AcceptChannel) {}
591591
fn handle_funding_created(&self, _their_node_id: &PublicKey, _msg: &FundingCreated) {}
592592
fn handle_funding_signed(&self, _their_node_id: &PublicKey, _msg: &FundingSigned) {}
593593
fn handle_channel_ready(&self, _their_node_id: &PublicKey, _msg: &ChannelReady) {}
594-
fn handle_shutdown(&self, _their_node_id: &PublicKey, _their_features: &InitFeatures, _msg: &Shutdown) {}
594+
fn handle_shutdown(&self, _their_node_id: &PublicKey, _msg: &Shutdown) {}
595595
fn handle_closing_signed(&self, _their_node_id: &PublicKey, _msg: &ClosingSigned) {}
596596
fn handle_update_add_htlc(&self, _their_node_id: &PublicKey, _msg: &UpdateAddHTLC) {}
597597
fn handle_update_fulfill_htlc(&self, _their_node_id: &PublicKey, _msg: &UpdateFulfillHTLC) {}

‎lightning/src/ln/chanmon_update_fail_tests.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -1832,8 +1832,8 @@ fn do_during_funding_monitor_fail(confirm_a_first: bool, restore_b_before_conf:
18321832
let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
18331833

18341834
nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100000, 10001, 43, None).unwrap();
1835-
nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), nodes[0].node.init_features(), &get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id()));
1836-
nodes[0].node.handle_accept_channel(&nodes[1].node.get_our_node_id(), nodes[1].node.init_features(), &get_event_msg!(nodes[1], MessageSendEvent::SendAcceptChannel, nodes[0].node.get_our_node_id()));
1835+
nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id()));
1836+
nodes[0].node.handle_accept_channel(&nodes[1].node.get_our_node_id(), &get_event_msg!(nodes[1], MessageSendEvent::SendAcceptChannel, nodes[0].node.get_our_node_id()));
18371837

18381838
let (temporary_channel_id, funding_tx, funding_output) = create_funding_transaction(&nodes[0], &nodes[1].node.get_our_node_id(), 100000, 43);
18391839

@@ -2547,10 +2547,10 @@ fn test_temporary_error_during_shutdown() {
25472547
chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::InProgress);
25482548

25492549
nodes[0].node.close_channel(&channel_id, &nodes[1].node.get_our_node_id()).unwrap();
2550-
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &nodes[0].node.init_features(), &get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[1].node.get_our_node_id()));
2550+
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[1].node.get_our_node_id()));
25512551
check_added_monitors!(nodes[1], 1);
25522552

2553-
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &nodes[1].node.init_features(), &get_event_msg!(nodes[1], MessageSendEvent::SendShutdown, nodes[0].node.get_our_node_id()));
2553+
nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &get_event_msg!(nodes[1], MessageSendEvent::SendShutdown, nodes[0].node.get_our_node_id()));
25542554
check_added_monitors!(nodes[0], 1);
25552555

25562556
assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty());
@@ -2622,7 +2622,7 @@ fn test_permanent_error_during_handling_shutdown() {
26222622

26232623
assert!(nodes[0].node.close_channel(&channel_id, &nodes[1].node.get_our_node_id()).is_ok());
26242624
let shutdown = get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[1].node.get_our_node_id());
2625-
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &nodes[0].node.init_features(), &shutdown);
2625+
nodes[1].node.handle_shutdown(&nodes[0].node.get_our_node_id(), &shutdown);
26262626
check_closed_broadcast!(nodes[1], true);
26272627
check_added_monitors!(nodes[1], 2);
26282628
check_closed_event!(nodes[1], 1, ClosureReason::ProcessingError { err: "ChannelMonitor storage failure".to_string() });
@@ -2747,7 +2747,7 @@ fn do_test_outbound_reload_without_init_mon(use_0conf: bool) {
27472747
let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
27482748

27492749
nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100000, 10001, 43, None).unwrap();
2750-
nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), nodes[0].node.init_features(), &get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id()));
2750+
nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id()));
27512751

27522752
let events = nodes[1].node.get_and_clear_pending_events();
27532753
assert_eq!(events.len(), 1);
@@ -2762,7 +2762,7 @@ fn do_test_outbound_reload_without_init_mon(use_0conf: bool) {
27622762
_ => panic!("Unexpected event"),
27632763
};
27642764

2765-
nodes[0].node.handle_accept_channel(&nodes[1].node.get_our_node_id(), nodes[1].node.init_features(), &get_event_msg!(nodes[1], MessageSendEvent::SendAcceptChannel, nodes[0].node.get_our_node_id()));
2765+
nodes[0].node.handle_accept_channel(&nodes[1].node.get_our_node_id(), &get_event_msg!(nodes[1], MessageSendEvent::SendAcceptChannel, nodes[0].node.get_our_node_id()));
27662766

27672767
let (temporary_channel_id, funding_tx, ..) = create_funding_transaction(&nodes[0], &nodes[1].node.get_our_node_id(), 100000, 43);
27682768

@@ -2836,7 +2836,7 @@ fn do_test_inbound_reload_without_init_mon(use_0conf: bool, lock_commitment: boo
28362836
let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
28372837

28382838
nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100000, 10001, 43, None).unwrap();
2839-
nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), nodes[0].node.init_features(), &get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id()));
2839+
nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel, nodes[1].node.get_our_node_id()));
28402840

28412841
let events = nodes[1].node.get_and_clear_pending_events();
28422842
assert_eq!(events.len(), 1);
@@ -2851,7 +2851,7 @@ fn do_test_inbound_reload_without_init_mon(use_0conf: bool, lock_commitment: boo
28512851
_ => panic!("Unexpected event"),
28522852
};
28532853

2854-
nodes[0].node.handle_accept_channel(&nodes[1].node.get_our_node_id(), nodes[1].node.init_features(), &get_event_msg!(nodes[1], MessageSendEvent::SendAcceptChannel, nodes[0].node.get_our_node_id()));
2854+
nodes[0].node.handle_accept_channel(&nodes[1].node.get_our_node_id(), &get_event_msg!(nodes[1], MessageSendEvent::SendAcceptChannel, nodes[0].node.get_our_node_id()));
28552855

28562856
let (temporary_channel_id, funding_tx, ..) = create_funding_transaction(&nodes[0], &nodes[1].node.get_our_node_id(), 100000, 43);
28572857

0 commit comments

Comments
 (0)