Give ChannelManagerReadArgs HashMap-of-monitors ownership

[rust-lightning] / lightning / src / ln / functional_tests.rs

diff --git a/lightning/src/ln/functional_tests.rs b/lightning/src/ln/functional_tests.rs
index f44a8d59e0981c75d2207163e0a7f8aaf317a89f..9087b17a81950028857e8fb776ea21989fb5d531 100644 (file)
--- a/lightning/src/ln/functional_tests.rs
+++ b/lightning/src/ln/functional_tests.rs
@@ -4318,7 +4318,7 @@ fn test_no_txn_manager_serialize_deserialize() {
                        monitor: nodes[0].chan_monitor,
                        tx_broadcaster: nodes[0].tx_broadcaster.clone(),
                        logger: &logger,
-                       channel_monitors: &mut channel_monitors,
+                       channel_monitors,
                }).unwrap()
        };
        nodes_0_deserialized = nodes_0_deserialized_tmp;
@@ -4426,7 +4426,7 @@ fn test_manager_serialize_deserialize_events() {
                        monitor: nodes[0].chan_monitor,
                        tx_broadcaster: nodes[0].tx_broadcaster.clone(),
                        logger: &logger,
-                       channel_monitors: &mut channel_monitors,
+                       channel_monitors,
                }).unwrap()
        };
        nodes_0_deserialized = nodes_0_deserialized_tmp;
@@ -4516,7 +4516,7 @@ fn test_simple_manager_serialize_deserialize() {
                        monitor: nodes[0].chan_monitor,
                        tx_broadcaster: nodes[0].tx_broadcaster.clone(),
                        logger: &logger,
-                       channel_monitors: &mut channel_monitors,
+                       channel_monitors,
                }).unwrap()
        };
        nodes_0_deserialized = nodes_0_deserialized_tmp;
@@ -4606,7 +4606,7 @@ fn test_manager_serialize_deserialize_inconsistent_monitor() {
                monitor: nodes[0].chan_monitor,
                tx_broadcaster: nodes[0].tx_broadcaster.clone(),
                logger: &logger,
-               channel_monitors: &mut node_0_stale_monitors.iter_mut().map(|monitor| { (monitor.get_funding_txo().0, monitor) }).collect(),
+               channel_monitors: node_0_stale_monitors.iter_mut().map(|monitor| { (monitor.get_funding_txo().0, monitor) }).collect(),
        }) { } else {
                panic!("If the monitor(s) are stale, this indicates a bug and we should get an Err return");
        };
@@ -4620,7 +4620,7 @@ fn test_manager_serialize_deserialize_inconsistent_monitor() {
                monitor: nodes[0].chan_monitor,
                tx_broadcaster: nodes[0].tx_broadcaster.clone(),
                logger: &logger,
-               channel_monitors: &mut node_0_monitors.iter_mut().map(|monitor| { (monitor.get_funding_txo().0, monitor) }).collect(),
+               channel_monitors: node_0_monitors.iter_mut().map(|monitor| { (monitor.get_funding_txo().0, monitor) }).collect(),
        }).unwrap();
        nodes_0_deserialized = nodes_0_deserialized_tmp;
        assert!(nodes_0_read.is_empty());
@@ -7891,7 +7891,7 @@ fn test_data_loss_protect() {
                        logger: &logger,
                        tx_broadcaster: &tx_broadcaster,
                        default_config: UserConfig::default(),
-                       channel_monitors: &mut channel_monitors,
+                       channel_monitors,
                }).unwrap().1
        };
        nodes[0].node = &node_state_0;