Move blinded path util into blinded_path::utils

[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 8fb9badba1c74627547a9c6e712618ae70ddc709..bab1b097e37c248edf70edf351a164055f9f933b 100644 (file)
--- a/lightning/src/ln/reorg_tests.rs
+++ b/lightning/src/ln/reorg_tests.rs
@@ -230,7 +230,7 @@ fn test_counterparty_revoked_reorg() {
 
        // Connect the HTLC claim transaction for HTLC 3
        mine_transaction(&nodes[1], &unrevoked_local_txn[2]);
-       expect_payment_sent!(nodes[1], payment_preimage_3);
+       expect_payment_sent(&nodes[1], payment_preimage_3, None, true, false);
        assert!(nodes[1].node.get_and_clear_pending_msg_events().is_empty());
 
        // Connect blocks to confirm the unrevoked commitment transaction
@@ -244,10 +244,12 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
        // around freeing background events which store monitor updates during block_[dis]connected.
        let chanmon_cfgs = create_chanmon_cfgs(2);
        let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
+       let persister;
+       let new_chain_monitor;
+
        let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
-       let persister: test_utils::TestPersister;
-       let new_chain_monitor: test_utils::TestChainMonitor;
-       let nodes_0_deserialized: ChannelManager<&test_utils::TestChainMonitor, &test_utils::TestBroadcaster, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestKeysInterface, &test_utils::TestFeeEstimator, &test_utils::TestRouter, &test_utils::TestLogger>;
+       let nodes_0_deserialized;
+
        let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
        *nodes[0].connect_style.borrow_mut() = connect_style;