Skip to content

Commit 0a598a3

Browse files
committed
Update test_peer_storage style to match newer tests
...somewhat cleaning up rustfmt crust.
1 parent c6103e6 commit 0a598a3

File tree

1 file changed

+19
-35
lines changed

1 file changed

+19
-35
lines changed

lightning/src/ln/reload_tests.rs

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,6 +1318,9 @@ fn test_peer_storage() {
13181318
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
13191319
let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
13201320

1321+
let node_a_id = nodes[0].node.get_our_node_id();
1322+
let node_b_id = nodes[1].node.get_our_node_id();
1323+
13211324
let (_, _, cid, _) = create_announced_chan_between_nodes(&nodes, 0, 1);
13221325
send_payment(&nodes[0], &[&nodes[1]], 1000);
13231326
let nodes_0_serialized = nodes[0].node.encode();
@@ -1339,8 +1342,8 @@ fn test_peer_storage() {
13391342
for ps_msg in peer_storage_msg_events_node0 {
13401343
match ps_msg {
13411344
MessageSendEvent::SendPeerStorage { ref node_id, ref msg } => {
1342-
assert_eq!(*node_id, nodes[1].node.get_our_node_id());
1343-
nodes[1].node.handle_peer_storage(nodes[0].node.get_our_node_id(), msg.clone());
1345+
assert_eq!(*node_id, node_b_id);
1346+
nodes[1].node.handle_peer_storage(node_a_id, msg.clone());
13441347
},
13451348
_ => panic!("Unexpected event"),
13461349
}
@@ -1349,15 +1352,15 @@ fn test_peer_storage() {
13491352
for ps_msg in peer_storage_msg_events_node1 {
13501353
match ps_msg {
13511354
MessageSendEvent::SendPeerStorage { ref node_id, ref msg } => {
1352-
assert_eq!(*node_id, nodes[0].node.get_our_node_id());
1353-
nodes[0].node.handle_peer_storage(nodes[1].node.get_our_node_id(), msg.clone());
1355+
assert_eq!(*node_id, node_a_id);
1356+
nodes[0].node.handle_peer_storage(node_b_id, msg.clone());
13541357
},
13551358
_ => panic!("Unexpected event"),
13561359
}
13571360
}
13581361

1359-
nodes[0].node.peer_disconnected(nodes[1].node.get_our_node_id());
1360-
nodes[1].node.peer_disconnected(nodes[0].node.get_our_node_id());
1362+
nodes[0].node.peer_disconnected(node_b_id);
1363+
nodes[1].node.peer_disconnected(node_a_id);
13611364

13621365
// Reload Node!
13631366
// TODO: Handle the case where we've completely forgotten about an active channel.
@@ -1371,31 +1374,14 @@ fn test_peer_storage() {
13711374
nodes_0_deserialized
13721375
);
13731376

1374-
nodes[0]
1375-
.node
1376-
.peer_connected(
1377-
nodes[1].node.get_our_node_id(),
1378-
&msgs::Init {
1379-
features: nodes[1].node.init_features(),
1380-
networks: None,
1381-
remote_network_address: None,
1382-
},
1383-
true,
1384-
)
1385-
.unwrap();
1377+
let init_msg = msgs::Init {
1378+
features: nodes[1].node.init_features(),
1379+
networks: None,
1380+
remote_network_address: None,
1381+
};
13861382

1387-
nodes[1]
1388-
.node
1389-
.peer_connected(
1390-
nodes[0].node.get_our_node_id(),
1391-
&msgs::Init {
1392-
features: nodes[0].node.init_features(),
1393-
networks: None,
1394-
remote_network_address: None,
1395-
},
1396-
false,
1397-
)
1398-
.unwrap();
1383+
nodes[0].node.peer_connected(node_b_id, &init_msg, true).unwrap();
1384+
nodes[1].node.peer_connected(node_a_id, &init_msg, true).unwrap();
13991385

14001386
let node_1_events = nodes[1].node.get_and_clear_pending_msg_events();
14011387
assert_eq!(node_1_events.len(), 2);
@@ -1405,19 +1391,17 @@ fn test_peer_storage() {
14051391

14061392
match node_0_events[0] {
14071393
MessageSendEvent::SendChannelReestablish { ref node_id, .. } => {
1408-
assert_eq!(*node_id, nodes[1].node.get_our_node_id());
1394+
assert_eq!(*node_id, node_b_id);
14091395
// nodes[0] would send a stale channel reestablish, so there's no need to handle this.
14101396
},
14111397
_ => panic!("Unexpected event"),
14121398
}
14131399

14141400
if let MessageSendEvent::SendPeerStorageRetrieval { node_id, msg } = &node_1_events[0] {
1415-
assert_eq!(*node_id, nodes[0].node.get_our_node_id());
1401+
assert_eq!(*node_id, node_a_id);
14161402
// Should Panic here!
14171403
let res = std::panic::catch_unwind(|| {
1418-
nodes[0]
1419-
.node
1420-
.handle_peer_storage_retrieval(nodes[1].node.get_our_node_id(), msg.clone())
1404+
nodes[0].node.handle_peer_storage_retrieval(node_b_id, msg.clone());
14211405
});
14221406
assert!(res.is_err());
14231407
} else {

0 commit comments

Comments
 (0)