Merge pull request #2466 from TheBlueMatt/2023-07-expose-success-prob

[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 bab1b097e37c248edf70edf351a164055f9f933b..35399b7dae4b63b9ae50e3a8151804fe16792219 100644 (file)
--- a/lightning/src/ln/reorg_tests.rs
+++ b/lightning/src/ln/reorg_tests.rs
@@ -13,7 +13,6 @@ use crate::chain::channelmonitor::{ANTI_REORG_DELAY, LATENCY_GRACE_PERIOD_BLOCKS
 use crate::chain::transaction::OutPoint;
 use crate::chain::Confirm;
 use crate::events::{Event, MessageSendEventsProvider, ClosureReason, HTLCDestination};
-use crate::ln::channelmanager::ChannelManager;
 use crate::ln::msgs::{ChannelMessageHandler, Init};
 use crate::util::test_utils;
 use crate::util::ser::Writeable;
@@ -578,8 +577,9 @@ fn do_test_to_remote_after_local_detection(style: ConnectStyle) {
 
        let mut node_a_spendable = nodes[0].chain_monitor.chain_monitor.get_and_clear_pending_events();
        assert_eq!(node_a_spendable.len(), 1);
-       if let Event::SpendableOutputs { outputs } = node_a_spendable.pop().unwrap() {
+       if let Event::SpendableOutputs { outputs, channel_id } = node_a_spendable.pop().unwrap() {
                assert_eq!(outputs.len(), 1);
+               assert_eq!(channel_id, Some(chan_id));
                let spend_tx = nodes[0].keys_manager.backing.spend_spendable_outputs(&[&outputs[0]], Vec::new(),
                        Builder::new().push_opcode(opcodes::all::OP_RETURN).into_script(), 253, None, &Secp256k1::new()).unwrap();
                check_spends!(spend_tx, remote_txn_b[0]);
@@ -598,8 +598,9 @@ fn do_test_to_remote_after_local_detection(style: ConnectStyle) {
 
        let mut node_b_spendable = nodes[1].chain_monitor.chain_monitor.get_and_clear_pending_events();
        assert_eq!(node_b_spendable.len(), 1);
-       if let Event::SpendableOutputs { outputs } = node_b_spendable.pop().unwrap() {
+       if let Event::SpendableOutputs { outputs, channel_id } = node_b_spendable.pop().unwrap() {
                assert_eq!(outputs.len(), 1);
+               assert_eq!(channel_id, Some(chan_id));
                let spend_tx = nodes[1].keys_manager.backing.spend_spendable_outputs(&[&outputs[0]], Vec::new(),
                        Builder::new().push_opcode(opcodes::all::OP_RETURN).into_script(), 253, None, &Secp256k1::new()).unwrap();
                check_spends!(spend_tx, remote_txn_a[0]);