mirror of
https://github.com/lightningdevkit/rust-lightning.git
synced 2025-02-25 07:17:40 +01:00
Move functional tests involving reorgs to reorg_test
functional_tests.rs is huge, so anything we can do to split it up some is helpful. This also exposes a somewhat glaring lack of reorgs in our existing tests.
This commit is contained in:
Matt Corallo
parent
4894d52d30
commit
89026766a3
2 changed files with 129 additions and 129 deletions
|
|
@ -51,7 +51,6 @@ use std::collections::{BTreeSet, HashMap, HashSet};
|
|||
use std::default::Default;
|
||||
use std::sync::Mutex;
|
||||
use std::sync::atomic::Ordering;
|
||||
use std::mem;
|
||||
|
||||
use ln::functional_test_utils::*;
|
||||
use ln::chan_utils::CommitmentTransaction;
|
||||
|
|
@ -3533,37 +3532,6 @@ fn test_force_close_fail_back() {
|
|||
check_spends!(node_txn[0], tx);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_unconf_chan() {
|
||||
// After creating a chan between nodes, we disconnect all blocks previously seen to force a channel close on nodes[0] side
|
||||
let chanmon_cfgs = create_chanmon_cfgs(2);
|
||||
let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
|
||||
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
|
||||
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
|
||||
create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
|
||||
|
||||
let channel_state = nodes[0].node.channel_state.lock().unwrap();
|
||||
assert_eq!(channel_state.by_id.len(), 1);
|
||||
assert_eq!(channel_state.short_to_id.len(), 1);
|
||||
mem::drop(channel_state);
|
||||
|
||||
let mut headers = Vec::new();
|
||||
let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
|
||||
headers.push(header.clone());
|
||||
for _i in 2..100 {
|
||||
header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
|
||||
headers.push(header.clone());
|
||||
}
|
||||
while !headers.is_empty() {
|
||||
nodes[0].node.block_disconnected(&headers.pop().unwrap());
|
||||
}
|
||||
check_closed_broadcast!(nodes[0], false);
|
||||
check_added_monitors!(nodes[0], 1);
|
||||
let channel_state = nodes[0].node.channel_state.lock().unwrap();
|
||||
assert_eq!(channel_state.by_id.len(), 0);
|
||||
assert_eq!(channel_state.short_to_id.len(), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_simple_peer_disconnect() {
|
||||
// Test that we can reconnect when there are no lost messages
|
||||
|
|
@ -8059,103 +8027,6 @@ fn test_bump_penalty_txn_on_remote_commitment() {
|
|||
nodes[1].node.get_and_clear_pending_msg_events();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_set_outpoints_partial_claiming() {
|
||||
// - remote party claim tx, new bump tx
|
||||
// - disconnect remote claiming tx, new bump
|
||||
// - disconnect tx, see no tx anymore
|
||||
let chanmon_cfgs = create_chanmon_cfgs(2);
|
||||
let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
|
||||
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
|
||||
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
|
||||
|
||||
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000, InitFeatures::known(), InitFeatures::known());
|
||||
let payment_preimage_1 = route_payment(&nodes[1], &vec!(&nodes[0])[..], 3_000_000).0;
|
||||
let payment_preimage_2 = route_payment(&nodes[1], &vec!(&nodes[0])[..], 3_000_000).0;
|
||||
|
||||
// Remote commitment txn with 4 outputs: to_local, to_remote, 2 outgoing HTLC
|
||||
let remote_txn = get_local_commitment_txn!(nodes[1], chan.2);
|
||||
assert_eq!(remote_txn.len(), 3);
|
||||
assert_eq!(remote_txn[0].output.len(), 4);
|
||||
assert_eq!(remote_txn[0].input.len(), 1);
|
||||
assert_eq!(remote_txn[0].input[0].previous_output.txid, chan.3.txid());
|
||||
check_spends!(remote_txn[1], remote_txn[0]);
|
||||
check_spends!(remote_txn[2], remote_txn[0]);
|
||||
|
||||
// Connect blocks on node A to advance height towards TEST_FINAL_CLTV
|
||||
let prev_header_100 = connect_blocks(&nodes[1], 100, 0, false, Default::default());
|
||||
// Provide node A with both preimage
|
||||
nodes[0].node.claim_funds(payment_preimage_1, &None, 3_000_000);
|
||||
nodes[0].node.claim_funds(payment_preimage_2, &None, 3_000_000);
|
||||
check_added_monitors!(nodes[0], 2);
|
||||
nodes[0].node.get_and_clear_pending_events();
|
||||
nodes[0].node.get_and_clear_pending_msg_events();
|
||||
|
||||
// Connect blocks on node A commitment transaction
|
||||
let header = BlockHeader { version: 0x20000000, prev_blockhash: prev_header_100, merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
|
||||
connect_block(&nodes[0], &Block { header, txdata: vec![remote_txn[0].clone()] }, 101);
|
||||
check_closed_broadcast!(nodes[0], false);
|
||||
check_added_monitors!(nodes[0], 1);
|
||||
// Verify node A broadcast tx claiming both HTLCs
|
||||
{
|
||||
let mut node_txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap();
|
||||
// ChannelMonitor: claim tx, ChannelManager: local commitment tx + HTLC-Success*2
|
||||
assert_eq!(node_txn.len(), 4);
|
||||
check_spends!(node_txn[0], remote_txn[0]);
|
||||
check_spends!(node_txn[1], chan.3);
|
||||
check_spends!(node_txn[2], node_txn[1]);
|
||||
check_spends!(node_txn[3], node_txn[1]);
|
||||
assert_eq!(node_txn[0].input.len(), 2);
|
||||
node_txn.clear();
|
||||
}
|
||||
|
||||
// Connect blocks on node B
|
||||
connect_blocks(&nodes[1], 135, 0, false, Default::default());
|
||||
check_closed_broadcast!(nodes[1], false);
|
||||
check_added_monitors!(nodes[1], 1);
|
||||
// Verify node B broadcast 2 HTLC-timeout txn
|
||||
let partial_claim_tx = {
|
||||
let node_txn = nodes[1].tx_broadcaster.txn_broadcasted.lock().unwrap();
|
||||
assert_eq!(node_txn.len(), 3);
|
||||
check_spends!(node_txn[1], node_txn[0]);
|
||||
check_spends!(node_txn[2], node_txn[0]);
|
||||
assert_eq!(node_txn[1].input.len(), 1);
|
||||
assert_eq!(node_txn[2].input.len(), 1);
|
||||
node_txn[1].clone()
|
||||
};
|
||||
|
||||
// Broadcast partial claim on node A, should regenerate a claiming tx with HTLC dropped
|
||||
let header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
|
||||
connect_block(&nodes[0], &Block { header, txdata: vec![partial_claim_tx.clone()] }, 102);
|
||||
{
|
||||
let mut node_txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap();
|
||||
assert_eq!(node_txn.len(), 1);
|
||||
check_spends!(node_txn[0], remote_txn[0]);
|
||||
assert_eq!(node_txn[0].input.len(), 1); //dropped HTLC
|
||||
node_txn.clear();
|
||||
}
|
||||
nodes[0].node.get_and_clear_pending_msg_events();
|
||||
|
||||
// Disconnect last block on node A, should regenerate a claiming tx with HTLC dropped
|
||||
disconnect_block(&nodes[0], &header, 102);
|
||||
{
|
||||
let mut node_txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap();
|
||||
assert_eq!(node_txn.len(), 1);
|
||||
check_spends!(node_txn[0], remote_txn[0]);
|
||||
assert_eq!(node_txn[0].input.len(), 2); //resurrected HTLC
|
||||
node_txn.clear();
|
||||
}
|
||||
|
||||
//// Disconnect one more block and then reconnect multiple no transaction should be generated
|
||||
disconnect_block(&nodes[0], &header, 101);
|
||||
connect_blocks(&nodes[1], 15, 101, false, prev_header_100);
|
||||
{
|
||||
let mut node_txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap();
|
||||
assert_eq!(node_txn.len(), 0);
|
||||
node_txn.clear();
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_counterparty_raa_skip_no_crash() {
|
||||
// Previously, if our counterparty sent two RAAs in a row without us having provided a
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ use util::events::{Event, EventsProvider, MessageSendEvent, MessageSendEventsPro
|
|||
use bitcoin::blockdata::block::{Block, BlockHeader};
|
||||
|
||||
use std::default::Default;
|
||||
use std::mem;
|
||||
|
||||
use ln::functional_test_utils::*;
|
||||
|
||||
|
|
@ -180,3 +181,131 @@ fn test_onchain_htlc_claim_reorg_remote_commitment() {
|
|||
fn test_onchain_htlc_timeout_delay_remote_commitment() {
|
||||
do_test_onchain_htlc_reorg(false, false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_unconf_chan() {
|
||||
// After creating a chan between nodes, we disconnect all blocks previously seen to force a channel close on nodes[0] side
|
||||
let chanmon_cfgs = create_chanmon_cfgs(2);
|
||||
let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
|
||||
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
|
||||
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
|
||||
create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
|
||||
|
||||
let channel_state = nodes[0].node.channel_state.lock().unwrap();
|
||||
assert_eq!(channel_state.by_id.len(), 1);
|
||||
assert_eq!(channel_state.short_to_id.len(), 1);
|
||||
mem::drop(channel_state);
|
||||
|
||||
let mut headers = Vec::new();
|
||||
let mut header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
|
||||
headers.push(header.clone());
|
||||
for _i in 2..100 {
|
||||
header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
|
||||
headers.push(header.clone());
|
||||
}
|
||||
while !headers.is_empty() {
|
||||
nodes[0].node.block_disconnected(&headers.pop().unwrap());
|
||||
}
|
||||
check_closed_broadcast!(nodes[0], false);
|
||||
check_added_monitors!(nodes[0], 1);
|
||||
let channel_state = nodes[0].node.channel_state.lock().unwrap();
|
||||
assert_eq!(channel_state.by_id.len(), 0);
|
||||
assert_eq!(channel_state.short_to_id.len(), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_set_outpoints_partial_claiming() {
|
||||
// - remote party claim tx, new bump tx
|
||||
// - disconnect remote claiming tx, new bump
|
||||
// - disconnect tx, see no tx anymore
|
||||
let chanmon_cfgs = create_chanmon_cfgs(2);
|
||||
let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
|
||||
let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
|
||||
let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
|
||||
|
||||
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 59000000, InitFeatures::known(), InitFeatures::known());
|
||||
let payment_preimage_1 = route_payment(&nodes[1], &vec!(&nodes[0])[..], 3_000_000).0;
|
||||
let payment_preimage_2 = route_payment(&nodes[1], &vec!(&nodes[0])[..], 3_000_000).0;
|
||||
|
||||
// Remote commitment txn with 4 outputs: to_local, to_remote, 2 outgoing HTLC
|
||||
let remote_txn = get_local_commitment_txn!(nodes[1], chan.2);
|
||||
assert_eq!(remote_txn.len(), 3);
|
||||
assert_eq!(remote_txn[0].output.len(), 4);
|
||||
assert_eq!(remote_txn[0].input.len(), 1);
|
||||
assert_eq!(remote_txn[0].input[0].previous_output.txid, chan.3.txid());
|
||||
check_spends!(remote_txn[1], remote_txn[0]);
|
||||
check_spends!(remote_txn[2], remote_txn[0]);
|
||||
|
||||
// Connect blocks on node A to advance height towards TEST_FINAL_CLTV
|
||||
let prev_header_100 = connect_blocks(&nodes[1], 100, 0, false, Default::default());
|
||||
// Provide node A with both preimage
|
||||
nodes[0].node.claim_funds(payment_preimage_1, &None, 3_000_000);
|
||||
nodes[0].node.claim_funds(payment_preimage_2, &None, 3_000_000);
|
||||
check_added_monitors!(nodes[0], 2);
|
||||
nodes[0].node.get_and_clear_pending_events();
|
||||
nodes[0].node.get_and_clear_pending_msg_events();
|
||||
|
||||
// Connect blocks on node A commitment transaction
|
||||
let header = BlockHeader { version: 0x20000000, prev_blockhash: prev_header_100, merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
|
||||
connect_block(&nodes[0], &Block { header, txdata: vec![remote_txn[0].clone()] }, 101);
|
||||
check_closed_broadcast!(nodes[0], false);
|
||||
check_added_monitors!(nodes[0], 1);
|
||||
// Verify node A broadcast tx claiming both HTLCs
|
||||
{
|
||||
let mut node_txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap();
|
||||
// ChannelMonitor: claim tx, ChannelManager: local commitment tx + HTLC-Success*2
|
||||
assert_eq!(node_txn.len(), 4);
|
||||
check_spends!(node_txn[0], remote_txn[0]);
|
||||
check_spends!(node_txn[1], chan.3);
|
||||
check_spends!(node_txn[2], node_txn[1]);
|
||||
check_spends!(node_txn[3], node_txn[1]);
|
||||
assert_eq!(node_txn[0].input.len(), 2);
|
||||
node_txn.clear();
|
||||
}
|
||||
|
||||
// Connect blocks on node B
|
||||
connect_blocks(&nodes[1], 135, 0, false, Default::default());
|
||||
check_closed_broadcast!(nodes[1], false);
|
||||
check_added_monitors!(nodes[1], 1);
|
||||
// Verify node B broadcast 2 HTLC-timeout txn
|
||||
let partial_claim_tx = {
|
||||
let node_txn = nodes[1].tx_broadcaster.txn_broadcasted.lock().unwrap();
|
||||
assert_eq!(node_txn.len(), 3);
|
||||
check_spends!(node_txn[1], node_txn[0]);
|
||||
check_spends!(node_txn[2], node_txn[0]);
|
||||
assert_eq!(node_txn[1].input.len(), 1);
|
||||
assert_eq!(node_txn[2].input.len(), 1);
|
||||
node_txn[1].clone()
|
||||
};
|
||||
|
||||
// Broadcast partial claim on node A, should regenerate a claiming tx with HTLC dropped
|
||||
let header = BlockHeader { version: 0x20000000, prev_blockhash: header.block_hash(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
|
||||
connect_block(&nodes[0], &Block { header, txdata: vec![partial_claim_tx.clone()] }, 102);
|
||||
{
|
||||
let mut node_txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap();
|
||||
assert_eq!(node_txn.len(), 1);
|
||||
check_spends!(node_txn[0], remote_txn[0]);
|
||||
assert_eq!(node_txn[0].input.len(), 1); //dropped HTLC
|
||||
node_txn.clear();
|
||||
}
|
||||
nodes[0].node.get_and_clear_pending_msg_events();
|
||||
|
||||
// Disconnect last block on node A, should regenerate a claiming tx with HTLC dropped
|
||||
disconnect_block(&nodes[0], &header, 102);
|
||||
{
|
||||
let mut node_txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap();
|
||||
assert_eq!(node_txn.len(), 1);
|
||||
check_spends!(node_txn[0], remote_txn[0]);
|
||||
assert_eq!(node_txn[0].input.len(), 2); //resurrected HTLC
|
||||
node_txn.clear();
|
||||
}
|
||||
|
||||
//// Disconnect one more block and then reconnect multiple no transaction should be generated
|
||||
disconnect_block(&nodes[0], &header, 101);
|
||||
connect_blocks(&nodes[1], 15, 101, false, prev_header_100);
|
||||
{
|
||||
let mut node_txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap();
|
||||
assert_eq!(node_txn.len(), 0);
|
||||
node_txn.clear();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue