X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Freorg_tests.rs;h=f6754e8bf2dc8d6e11f0a56370117436bddd57cb;hb=17e1403856933f9649413a179325eaea25da825e;hp=3481e8d6cd9f39b60e4b186d8cf403f63ebc6afd;hpb=505102dc212df338091d8448c13b06f477170998;p=rust-lightning diff --git a/lightning/src/ln/reorg_tests.rs b/lightning/src/ln/reorg_tests.rs index 3481e8d6..f6754e8b 100644 --- a/lightning/src/ln/reorg_tests.rs +++ b/lightning/src/ln/reorg_tests.rs @@ -9,20 +9,18 @@ //! Further functional tests which test blockchain reorganizations. -use crate::chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor}; +use crate::chain::channelmonitor::ANTI_REORG_DELAY; use crate::chain::transaction::OutPoint; -use crate::chain::{ChannelMonitorUpdateStatus, Confirm, Watch}; -use crate::ln::channelmanager::{self, ChannelManager, ChannelManagerReadArgs}; +use crate::chain::Confirm; +use crate::ln::channelmanager::{self, ChannelManager}; use crate::ln::msgs::ChannelMessageHandler; -use crate::util::enforcing_trait_impls::EnforcingSigner; use crate::util::events::{Event, MessageSendEvent, MessageSendEventsProvider, ClosureReason, HTLCDestination}; use crate::util::test_utils; -use crate::util::ser::{ReadableArgs, Writeable}; +use crate::util::ser::Writeable; use bitcoin::blockdata::block::{Block, BlockHeader}; use bitcoin::blockdata::script::Builder; use bitcoin::blockdata::opcodes; -use bitcoin::hash_types::BlockHash; use bitcoin::secp256k1::Secp256k1; use crate::prelude::*; @@ -271,6 +269,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_ let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs); *nodes[0].connect_style.borrow_mut() = connect_style; + let chan_conf_height = core::cmp::max(nodes[0].best_block_info().1 + 1, nodes[1].best_block_info().1 + 1); let chan = create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features()); let channel_state = nodes[0].node.channel_state.lock().unwrap(); @@ -281,8 +280,13 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_ if !reorg_after_reload { if use_funding_unconfirmed { let relevant_txids = nodes[0].node.get_relevant_txids(); - assert_eq!(&relevant_txids[..], &[chan.3.txid()]); - nodes[0].node.transaction_unconfirmed(&relevant_txids[0]); + assert_eq!(relevant_txids.len(), 1); + let block_hash_opt = relevant_txids[0].1; + let expected_hash = nodes[0].get_block_header(chan_conf_height).block_hash(); + assert_eq!(block_hash_opt, Some(expected_hash)); + let txid = relevant_txids[0].0; + assert_eq!(txid, chan.3.txid()); + nodes[0].node.transaction_unconfirmed(&txid); } else if connect_style == ConnectStyle::FullBlockViaListen { disconnect_blocks(&nodes[0], CHAN_CONFIRM_DEPTH - 1); assert_eq!(nodes[0].node.list_usable_channels().len(), 1); @@ -290,6 +294,10 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_ } else { disconnect_all_blocks(&nodes[0]); } + + let relevant_txids = nodes[0].node.get_relevant_txids(); + assert_eq!(relevant_txids.len(), 0); + handle_announce_close_broadcast_events(&nodes, 0, 1, true, "Channel closed because of an exception: Funding transaction was un-confirmed. Locked at 6 confs, now have 0 confs."); check_added_monitors!(nodes[1], 1); { @@ -305,53 +313,27 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_ // the Channel object from the ChannelManager, but still having a monitor event pending for // it when we go to deserialize, and then use the ChannelManager. let nodes_0_serialized = nodes[0].node.encode(); - let mut chan_0_monitor_serialized = test_utils::TestVecWriter(Vec::new()); - get_monitor!(nodes[0], chan.2).write(&mut chan_0_monitor_serialized).unwrap(); - - persister = test_utils::TestPersister::new(); - let keys_manager = &chanmon_cfgs[0].keys_manager; - new_chain_monitor = test_utils::TestChainMonitor::new(Some(nodes[0].chain_source), nodes[0].tx_broadcaster.clone(), nodes[0].logger, node_cfgs[0].fee_estimator, &persister, keys_manager); - nodes[0].chain_monitor = &new_chain_monitor; - let mut chan_0_monitor_read = &chan_0_monitor_serialized.0[..]; - let (_, mut chan_0_monitor) = <(BlockHash, ChannelMonitor)>::read( - &mut chan_0_monitor_read, keys_manager).unwrap(); - assert!(chan_0_monitor_read.is_empty()); - - let mut nodes_0_read = &nodes_0_serialized[..]; - nodes_0_deserialized = { - let mut channel_monitors = HashMap::new(); - channel_monitors.insert(chan_0_monitor.get_funding_txo().0, &mut chan_0_monitor); - <(BlockHash, ChannelManager<&test_utils::TestChainMonitor, &test_utils::TestBroadcaster, - &test_utils::TestKeysInterface, &test_utils::TestFeeEstimator, &test_utils::TestLogger>)>::read( - &mut nodes_0_read, ChannelManagerReadArgs { - default_config: *nodes[0].node.get_current_default_configuration(), - keys_manager, - fee_estimator: node_cfgs[0].fee_estimator, - chain_monitor: nodes[0].chain_monitor, - tx_broadcaster: nodes[0].tx_broadcaster.clone(), - logger: nodes[0].logger, - channel_monitors, - }).unwrap().1 - }; - nodes[0].node = &nodes_0_deserialized; - assert!(nodes_0_read.is_empty()); + let chan_0_monitor_serialized = get_monitor!(nodes[0], chan.2).encode(); + + reload_node!(nodes[0], *nodes[0].node.get_current_default_configuration(), &nodes_0_serialized, &[&chan_0_monitor_serialized], persister, new_chain_monitor, nodes_0_deserialized); if !reorg_after_reload { // If the channel is already closed when we reload the node, we'll broadcast a closing // transaction via the ChannelMonitor which is missing a corresponding channel. assert_eq!(nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().len(), 1); nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().clear(); } - - assert_eq!(nodes[0].chain_monitor.watch_channel(chan_0_monitor.get_funding_txo().0.clone(), chan_0_monitor), - ChannelMonitorUpdateStatus::Completed); - check_added_monitors!(nodes[0], 1); } if reorg_after_reload { if use_funding_unconfirmed { let relevant_txids = nodes[0].node.get_relevant_txids(); - assert_eq!(&relevant_txids[..], &[chan.3.txid()]); - nodes[0].node.transaction_unconfirmed(&relevant_txids[0]); + assert_eq!(relevant_txids.len(), 1); + let block_hash_opt = relevant_txids[0].1; + let expected_hash = nodes[0].get_block_header(chan_conf_height).block_hash(); + assert_eq!(block_hash_opt, Some(expected_hash)); + let txid = relevant_txids[0].0; + assert_eq!(txid, chan.3.txid()); + nodes[0].node.transaction_unconfirmed(&txid); } else if connect_style == ConnectStyle::FullBlockViaListen { disconnect_blocks(&nodes[0], CHAN_CONFIRM_DEPTH - 1); assert_eq!(nodes[0].node.list_channels().len(), 1); @@ -359,6 +341,10 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_ } else { disconnect_all_blocks(&nodes[0]); } + + let relevant_txids = nodes[0].node.get_relevant_txids(); + assert_eq!(relevant_txids.len(), 0); + handle_announce_close_broadcast_events(&nodes, 0, 1, true, "Channel closed because of an exception: Funding transaction was un-confirmed. Locked at 6 confs, now have 0 confs."); check_added_monitors!(nodes[1], 1); {