f duh

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -1716,7 +1716,11 @@ macro_rules! process_events_body {
 
 		let _single_processor = $self.pending_events_processor.lock().unwrap();
 		loop {
+			#[cfg(debug_assertions)]
 			let mut next_event = $self.pending_events.lock().unwrap().front().map(|ev| (*ev).clone());
+			#[cfg(not(debug_assertions))]
+			let mut next_event = $self.pending_events.lock().unwrap().pop_front();
+
 			let mut post_event_actions = Vec::new();
 			loop {
 				if let Some((event, action_opt)) = next_event {
@@ -1727,20 +1731,23 @@ macro_rules! process_events_body {
 					}
 					$event_to_handle = event;
 					$handle_event;
-					let mut pending_events = $self.pending_events.lock().unwrap();
-					// We're required to take the `pending_events_processor` lock any time we
-					// remove from `pending_events`, however have no general way to enforce that.
-					// Instead, here, we assert that the next event hasn't changed out from under
-					// us.
 					#[cfg(debug_assertions)] {
+						let mut pending_events = $self.pending_events.lock().unwrap();
+						// We're required to take the `pending_events_processor` lock any time we
+						// remove from `pending_events`, however have no general way to enforce that.
+						// Instead, here, we assert that the next event hasn't changed out from under
+						// us.
 						debug_assert_eq!(_ev_clone, pending_events.front().unwrap().0);
+						debug_assert_eq!(action_opt, pending_events.front().unwrap().1);
+						pending_events.pop_front();
+						next_event = pending_events.front().map(|ev| ev.clone());
+					}
+					#[cfg(not(debug_assertions))] {
+						next_event = pending_events.pop_front();
 					}
-					debug_assert_eq!(action_opt, pending_events.front().unwrap().1);
 					if let Some(action) = action_opt {
 						post_event_actions.push(action);
 					}
-					pending_events.pop_front();
-					next_event = pending_events.front().map(|ev| ev.clone());
 				} else {
 					break;
 				}