Skip to content

Commit 31cb34b

Browse files
tnulltnull
committed
Prepare lightning-background-processor/src/lib.rs 
1 parent bcacf85 commit 31cb34b

File tree

1 file changed

+33
-21
lines changed
  • lightning-background-processor/src

1 file changed

+33
-21
lines changed

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

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,8 @@ where
694694
let logger = &logger;
695695
let persister = &persister;
696696
let fetch_time = &fetch_time;
697-
Box::pin(async move { // We should be able to drop the Box once our MSRV is 1.68
697+
// We should be able to drop the Box once our MSRV is 1.68
698+
Box::pin(async move {
698699
if let Some(network_graph) = network_graph {
699700
handle_network_graph_update(network_graph, &event)
700701
}
@@ -1309,12 +1310,14 @@ mod tests {
13091310

13101311
for i in 0..num_nodes {
13111312
for j in (i+1)..num_nodes {
1312-
nodes[i].node.peer_connected(&nodes[j].node.get_our_node_id(), &Init {
1313+
let init_i = Init {
13131314
features: nodes[j].node.init_features(), networks: None, remote_network_address: None
1314-
}, true).unwrap();
1315-
nodes[j].node.peer_connected(&nodes[i].node.get_our_node_id(), &Init {
1315+
};
1316+
nodes[i].node.peer_connected(&nodes[j].node.get_our_node_id(), &init_i, true).unwrap();
1317+
let init_j = Init {
13161318
features: nodes[i].node.init_features(), networks: None, remote_network_address: None
1317-
}, false).unwrap();
1319+
};
1320+
nodes[j].node.peer_connected(&nodes[i].node.get_our_node_id(), &init_j, false).unwrap();
13181321
}
13191322
}
13201323

@@ -1328,9 +1331,11 @@ mod tests {
13281331
assert_eq!(events.len(), 1);
13291332
let (temporary_channel_id, tx) = handle_funding_generation_ready!(events[0], $channel_value);
13301333
$node_a.node.funding_transaction_generated(&temporary_channel_id, &$node_b.node.get_our_node_id(), tx.clone()).unwrap();
1331-
$node_b.node.handle_funding_created(&$node_a.node.get_our_node_id(), &get_event_msg!($node_a, MessageSendEvent::SendFundingCreated, $node_b.node.get_our_node_id()));
1334+
let msg_a = get_event_msg!($node_a, MessageSendEvent::SendFundingCreated, $node_b.node.get_our_node_id());
1335+
$node_b.node.handle_funding_created(&$node_a.node.get_our_node_id(), &msg_a);
13321336
get_event!($node_b, Event::ChannelPending);
1333-
$node_a.node.handle_funding_signed(&$node_b.node.get_our_node_id(), &get_event_msg!($node_b, MessageSendEvent::SendFundingSigned, $node_a.node.get_our_node_id()));
1337+
let msg_b = get_event_msg!($node_b, MessageSendEvent::SendFundingSigned, $node_a.node.get_our_node_id());
1338+
$node_a.node.handle_funding_signed(&$node_b.node.get_our_node_id(), &msg_b);
13341339
get_event!($node_a, Event::ChannelPending);
13351340
tx
13361341
}}
@@ -1339,8 +1344,10 @@ mod tests {
13391344
macro_rules! begin_open_channel {
13401345
($node_a: expr, $node_b: expr, $channel_value: expr) => {{
13411346
$node_a.node.create_channel($node_b.node.get_our_node_id(), $channel_value, 100, 42, None, None).unwrap();
1342-
$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()));
1343-
$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()));
1347+
let msg_a = get_event_msg!($node_a, MessageSendEvent::SendOpenChannel, $node_b.node.get_our_node_id());
1348+
$node_b.node.handle_open_channel(&$node_a.node.get_our_node_id(), &msg_a);
1349+
let msg_b = get_event_msg!($node_b, MessageSendEvent::SendAcceptChannel, $node_a.node.get_our_node_id());
1350+
$node_a.node.handle_accept_channel(&$node_b.node.get_our_node_id(), &msg_b);
13441351
}}
13451352
}
13461353

@@ -1378,7 +1385,8 @@ mod tests {
13781385
// We need the TestBroadcaster to know about the new height so that it doesn't think
13791386
// we're violating the time lock requirements of transactions broadcasted at that
13801387
// point.
1381-
node.tx_broadcaster.blocks.lock().unwrap().push((genesis_block(Network::Bitcoin), height));
1388+
let block = (genesis_block(Network::Bitcoin), height);
1389+
node.tx_broadcaster.blocks.lock().unwrap().push(block);
13821390
node.node.best_block_updated(&header, height);
13831391
node.chain_monitor.best_block_updated(&header, height);
13841392
node.sweeper.best_block_updated(&header, height);
@@ -1398,7 +1406,8 @@ mod tests {
13981406
// We need the TestBroadcaster to know about the new height so that it doesn't think
13991407
// we're violating the time lock requirements of transactions broadcasted at that
14001408
// point.
1401-
node.tx_broadcaster.blocks.lock().unwrap().push((genesis_block(Network::Bitcoin), height));
1409+
let block = (genesis_block(Network::Bitcoin), height);
1410+
node.tx_broadcaster.blocks.lock().unwrap().push(block);
14021411
node.node.best_block_updated(&header, height);
14031412
node.chain_monitor.best_block_updated(&header, height);
14041413
node.sweeper.best_block_updated(&header, height);
@@ -1601,6 +1610,9 @@ mod tests {
16011610
#[test]
16021611
fn test_background_event_handling() {
16031612
let (_, mut nodes) = create_nodes(2, "test_background_event_handling");
1613+
let node_0_id = nodes[0].node.get_our_node_id();
1614+
let node_1_id = nodes[1].node.get_our_node_id();
1615+
16041616
let channel_value = 100000;
16051617
let data_dir = nodes[0].kv_store.get_data_dir();
16061618
let persister = Arc::new(Persister::new(data_dir.clone()));
@@ -1622,22 +1634,22 @@ mod tests {
16221634
let (temporary_channel_id, funding_tx) = funding_generation_recv
16231635
.recv_timeout(Duration::from_secs(EVENT_DEADLINE))
16241636
.expect("FundingGenerationReady not handled within deadline");
1625-
nodes[0].node.funding_transaction_generated(&temporary_channel_id, &nodes[1].node.get_our_node_id(), funding_tx.clone()).unwrap();
1626-
nodes[1].node.handle_funding_created(&nodes[0].node.get_our_node_id(), &get_event_msg!(nodes[0], MessageSendEvent::SendFundingCreated, nodes[1].node.get_our_node_id()));
1637+
nodes[0].node.funding_transaction_generated(&temporary_channel_id, &node_1_id, funding_tx.clone()).unwrap();
1638+
nodes[1].node.handle_funding_created(&node_0_id, &get_event_msg!(nodes[0], MessageSendEvent::SendFundingCreated, node_1_id));
16271639
get_event!(nodes[1], Event::ChannelPending);
1628-
nodes[0].node.handle_funding_signed(&nodes[1].node.get_our_node_id(), &get_event_msg!(nodes[1], MessageSendEvent::SendFundingSigned, nodes[0].node.get_our_node_id()));
1640+
nodes[0].node.handle_funding_signed(&node_1_id, &get_event_msg!(nodes[1], MessageSendEvent::SendFundingSigned, node_0_id));
16291641
let _ = channel_pending_recv.recv_timeout(Duration::from_secs(EVENT_DEADLINE))
16301642
.expect("ChannelPending not handled within deadline");
16311643

16321644
// Confirm the funding transaction.
16331645
confirm_transaction(&mut nodes[0], &funding_tx);
1634-
let as_funding = get_event_msg!(nodes[0], MessageSendEvent::SendChannelReady, nodes[1].node.get_our_node_id());
1646+
let as_funding = get_event_msg!(nodes[0], MessageSendEvent::SendChannelReady, node_1_id);
16351647
confirm_transaction(&mut nodes[1], &funding_tx);
1636-
let bs_funding = get_event_msg!(nodes[1], MessageSendEvent::SendChannelReady, nodes[0].node.get_our_node_id());
1637-
nodes[0].node.handle_channel_ready(&nodes[1].node.get_our_node_id(), &bs_funding);
1638-
let _as_channel_update = get_event_msg!(nodes[0], MessageSendEvent::SendChannelUpdate, nodes[1].node.get_our_node_id());
1639-
nodes[1].node.handle_channel_ready(&nodes[0].node.get_our_node_id(), &as_funding);
1640-
let _bs_channel_update = get_event_msg!(nodes[1], MessageSendEvent::SendChannelUpdate, nodes[0].node.get_our_node_id());
1648+
let bs_funding = get_event_msg!(nodes[1], MessageSendEvent::SendChannelReady, node_0_id);
1649+
nodes[0].node.handle_channel_ready(&node_1_id, &bs_funding);
1650+
let _as_channel_update = get_event_msg!(nodes[0], MessageSendEvent::SendChannelUpdate, node_1_id);
1651+
nodes[1].node.handle_channel_ready(&node_0_id, &as_funding);
1652+
let _bs_channel_update = get_event_msg!(nodes[1], MessageSendEvent::SendChannelUpdate, node_0_id);
16411653
let broadcast_funding = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().pop().unwrap();
16421654
assert_eq!(broadcast_funding.txid(), funding_tx.txid());
16431655
assert!(nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().is_empty());
@@ -1659,7 +1671,7 @@ mod tests {
16591671

16601672
// Force close the channel and check that the SpendableOutputs event was handled.
16611673
let error_message = "Channel force-closed";
1662-
nodes[0].node.force_close_broadcasting_latest_txn(&nodes[0].node.list_channels()[0].channel_id, &nodes[1].node.get_our_node_id(), error_message.to_string()).unwrap();
1674+
nodes[0].node.force_close_broadcasting_latest_txn(&nodes[0].node.list_channels()[0].channel_id, &node_1_id, error_message.to_string()).unwrap();
16631675
let commitment_tx = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().pop().unwrap();
16641676
confirm_transaction_depth(&mut nodes[0], &commitment_tx, BREAKDOWN_TIMEOUT as u32);
16651677

0 commit comments

Comments
 (0)