f better panic messages

Author: TheBlueMatt

lightning/src/util/test_utils.rs

@@ -270,6 +270,7 @@ impl TestChannelMessageHandler {
 	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);
 		msgs.as_mut().unwrap().remove(0);
@@ -279,7 +280,9 @@ impl TestChannelMessageHandler {
 impl Drop for TestChannelMessageHandler {
 	fn drop(&mut self) {
 		let l = self.expected_recv_msgs.lock().unwrap();
-		assert!(l.is_none() || l.as_ref().unwrap().is_empty());
+		if !std::thread::panicking() {
+			assert!(l.is_none() || l.as_ref().unwrap().is_empty());
+		}
 	}
 }