Replace manual node reloading with a macro/function in tests

[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 a445f420a9c96011238a28a0eff4c7e0e8fe4426..f6754e8bf2dc8d6e11f0a56370117436bddd57cb 100644 (file)
--- 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::*;
@@ -315,46 +313,15 @@ 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<EnforcingSigner>)>::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 {