Skip to content

Commit 0b1978e

Browse files
committed
Extract init msgs
1 parent 07fe438 commit 0b1978e

File tree

1 file changed

+36
-68
lines changed

1 file changed

+36
-68
lines changed

lightning/src/ln/async_signer_tests.rs

Lines changed: 36 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -579,30 +579,20 @@ fn do_test_async_raa_peer_disconnect(
579579
dst.node.peer_disconnected(src.node.get_our_node_id());
580580

581581
// do reestablish stuff
582-
src.node
583-
.peer_connected(
584-
dst.node.get_our_node_id(),
585-
&msgs::Init {
586-
features: dst.node.init_features(),
587-
networks: None,
588-
remote_network_address: None,
589-
},
590-
true,
591-
)
592-
.unwrap();
582+
let init_msg = &msgs::Init {
583+
features: dst.node.init_features(),
584+
networks: None,
585+
remote_network_address: None,
586+
};
587+
src.node.peer_connected(dst.node.get_our_node_id(), init_msg, true).unwrap();
593588
let reestablish_1 = get_chan_reestablish_msgs!(src, dst);
594589
assert_eq!(reestablish_1.len(), 1);
595-
dst.node
596-
.peer_connected(
597-
src.node.get_our_node_id(),
598-
&msgs::Init {
599-
features: src.node.init_features(),
600-
networks: None,
601-
remote_network_address: None,
602-
},
603-
false,
604-
)
605-
.unwrap();
590+
let init_msg = &msgs::Init {
591+
features: src.node.init_features(),
592+
networks: None,
593+
remote_network_address: None,
594+
};
595+
dst.node.peer_connected(src.node.get_our_node_id(), init_msg, false).unwrap();
606596
let reestablish_2 = get_chan_reestablish_msgs!(dst, src);
607597
assert_eq!(reestablish_2.len(), 1);
608598

@@ -747,30 +737,20 @@ fn do_test_async_commitment_signature_peer_disconnect(
747737
dst.node.peer_disconnected(src.node.get_our_node_id());
748738

749739
// do reestablish stuff
750-
src.node
751-
.peer_connected(
752-
dst.node.get_our_node_id(),
753-
&msgs::Init {
754-
features: dst.node.init_features(),
755-
networks: None,
756-
remote_network_address: None,
757-
},
758-
true,
759-
)
760-
.unwrap();
740+
let init_msg = &msgs::Init {
741+
features: dst.node.init_features(),
742+
networks: None,
743+
remote_network_address: None,
744+
};
745+
src.node.peer_connected(dst.node.get_our_node_id(), init_msg, true).unwrap();
761746
let reestablish_1 = get_chan_reestablish_msgs!(src, dst);
762747
assert_eq!(reestablish_1.len(), 1);
763-
dst.node
764-
.peer_connected(
765-
src.node.get_our_node_id(),
766-
&msgs::Init {
767-
features: src.node.init_features(),
768-
networks: None,
769-
remote_network_address: None,
770-
},
771-
false,
772-
)
773-
.unwrap();
748+
let init_msg = &msgs::Init {
749+
features: src.node.init_features(),
750+
networks: None,
751+
remote_network_address: None,
752+
};
753+
dst.node.peer_connected(src.node.get_our_node_id(), init_msg, false).unwrap();
774754
let reestablish_2 = get_chan_reestablish_msgs!(dst, src);
775755
assert_eq!(reestablish_2.len(), 1);
776756

@@ -915,32 +895,20 @@ fn do_test_async_commitment_signature_ordering(monitor_update_failure: bool) {
915895
nodes[0].node.peer_disconnected(node_b_id);
916896
nodes[1].node.peer_disconnected(node_a_id);
917897

918-
nodes[0]
919-
.node
920-
.peer_connected(
921-
node_b_id,
922-
&msgs::Init {
923-
features: nodes[1].node.init_features(),
924-
networks: None,
925-
remote_network_address: None,
926-
},
927-
true,
928-
)
929-
.unwrap();
898+
let init_msg = &msgs::Init {
899+
features: nodes[1].node.init_features(),
900+
networks: None,
901+
remote_network_address: None,
902+
};
903+
nodes[0].node.peer_connected(node_b_id, init_msg, true).unwrap();
930904
let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]);
931905
assert_eq!(reestablish_1.len(), 1);
932-
nodes[1]
933-
.node
934-
.peer_connected(
935-
node_a_id,
936-
&msgs::Init {
937-
features: nodes[0].node.init_features(),
938-
networks: None,
939-
remote_network_address: None,
940-
},
941-
false,
942-
)
943-
.unwrap();
906+
let init_msg = &msgs::Init {
907+
features: nodes[0].node.init_features(),
908+
networks: None,
909+
remote_network_address: None,
910+
};
911+
nodes[1].node.peer_connected(node_a_id, init_msg, false).unwrap();
944912
let reestablish_2 = get_chan_reestablish_msgs!(nodes[1], nodes[0]);
945913
assert_eq!(reestablish_2.len(), 1);
946914

0 commit comments

Comments
 (0)