Merge pull request #1499 from tnull/2022-05-fix-unreachable-warning

[rust-lightning] / lightning / src / util / test_utils.rs

diff --git a/lightning/src/util/test_utils.rs b/lightning/src/util/test_utils.rs
index b5953834c8cacbefd28dfc4c892bd7d700b8e94c..3682a0e8f0af02d1ac654853bff16e3096f4025a 100644 (file)
--- a/lightning/src/util/test_utils.rs
+++ b/lightning/src/util/test_utils.rs
@@ -164,7 +164,7 @@ impl<'a> chain::Watch<EnforcingSigner> for TestChainMonitor<'a> {
                update_res
        }
 
-       fn release_pending_monitor_events(&self) -> Vec<MonitorEvent> {
+       fn release_pending_monitor_events(&self) -> Vec<(OutPoint, Vec<MonitorEvent>)> {
                return self.chain_monitor.release_pending_monitor_events();
        }
 }
@@ -267,12 +267,12 @@ impl TestChannelMessageHandler {
                expected_msgs.as_mut().unwrap().push(ev);
        }
 
-       fn received_msg(&self, ev: wire::Message<()>) {
+       fn received_msg(&self, _ev: wire::Message<()>) {
                let mut msgs = self.expected_recv_msgs.lock().unwrap();
                if msgs.is_none() { return; }
                assert!(!msgs.as_ref().unwrap().is_empty(), "Received message when we weren't expecting one");
                #[cfg(test)]
-               assert_eq!(msgs.as_ref().unwrap()[0], ev);
+               assert_eq!(msgs.as_ref().unwrap()[0], _ev);
                msgs.as_mut().unwrap().remove(0);
        }
 }