X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannelmanager.rs;h=482c1a2af464e4eed0f681e3020fcde9d5abf56f;hb=7f3faa061410b830baad33dcd678e351e99f2222;hp=dcc80382c33a9ea9728ba4eb4a3a3c96d95472d6;hpb=0dd987fc41240d96a13f2011cb0679eb6abdb3b1;p=rust-lightning

diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index dcc80382..482c1a2a 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -324,7 +324,7 @@ impl MsgHandleErrInternal {
 					},
 				},
 			},
-			chan_id: Some(channel_id),
+			chan_id: None,
 			shutdown_finish: None,
 		}
 	}
@@ -824,6 +824,7 @@ macro_rules! handle_error {
 					// In testing, ensure there are no deadlocks where the lock is already held upon
 					// entering the macro.
 					assert!($self.channel_state.try_lock().is_ok());
+					assert!($self.pending_events.try_lock().is_ok());
 				}
 
 				let mut msg_events = Vec::with_capacity(2);