projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1499 from tnull/2022-05-fix-unreachable-warning
[rust-lightning]
/
lightning
/
src
/
ln
/
reorg_tests.rs
diff --git
a/lightning/src/ln/reorg_tests.rs
b/lightning/src/ln/reorg_tests.rs
index 2f97864b10ec7c5a0fa7cf961547ff517406d11d..8a4ec2dc3518a4d9ca67ae7040c500563f7d9e3c 100644
(file)
--- a/
lightning/src/ln/reorg_tests.rs
+++ b/
lightning/src/ln/reorg_tests.rs
@@
-138,7
+138,7
@@
fn do_test_onchain_htlc_reorg(local_commitment: bool, claim: bool) {
// ChannelManager only polls chain::Watch::release_pending_monitor_events when we
// probe it for events, so we probe non-message events here (which should just be the
// PaymentForwarded event).
// ChannelManager only polls chain::Watch::release_pending_monitor_events when we
// probe it for events, so we probe non-message events here (which should just be the
// PaymentForwarded event).
- expect_payment_forwarded!(nodes[1], nodes[0],
Some(1000)
, true);
+ expect_payment_forwarded!(nodes[1], nodes[0],
nodes[2], Some(1000), true
, true);
} else {
// Confirm the timeout tx and check that we fail the HTLC backwards
let block = Block {
} else {
// Confirm the timeout tx and check that we fail the HTLC backwards
let block = Block {
@@
-209,6
+209,10
@@
fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
let relevant_txids = nodes[0].node.get_relevant_txids();
assert_eq!(&relevant_txids[..], &[chan.3.txid()]);
nodes[0].node.transaction_unconfirmed(&relevant_txids[0]);
let relevant_txids = nodes[0].node.get_relevant_txids();
assert_eq!(&relevant_txids[..], &[chan.3.txid()]);
nodes[0].node.transaction_unconfirmed(&relevant_txids[0]);
+ } else if connect_style == ConnectStyle::FullBlockViaListen {
+ disconnect_blocks(&nodes[0], CHAN_CONFIRM_DEPTH - 1);
+ assert_eq!(nodes[0].node.list_usable_channels().len(), 1);
+ disconnect_blocks(&nodes[0], 1);
} else {
disconnect_all_blocks(&nodes[0]);
}
} else {
disconnect_all_blocks(&nodes[0]);
}
@@
-273,6
+277,10
@@
fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
let relevant_txids = nodes[0].node.get_relevant_txids();
assert_eq!(&relevant_txids[..], &[chan.3.txid()]);
nodes[0].node.transaction_unconfirmed(&relevant_txids[0]);
let relevant_txids = nodes[0].node.get_relevant_txids();
assert_eq!(&relevant_txids[..], &[chan.3.txid()]);
nodes[0].node.transaction_unconfirmed(&relevant_txids[0]);
+ } else if connect_style == ConnectStyle::FullBlockViaListen {
+ disconnect_blocks(&nodes[0], CHAN_CONFIRM_DEPTH - 1);
+ assert_eq!(nodes[0].node.list_channels().len(), 1);
+ disconnect_blocks(&nodes[0], 1);
} else {
disconnect_all_blocks(&nodes[0]);
}
} else {
disconnect_all_blocks(&nodes[0]);
}