f rebase

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -1579,13 +1579,13 @@ macro_rules! send_channel_ready {
 macro_rules! emit_channel_pending_event {
 	($locked_events: expr, $channel: expr) => {
 		if $channel.should_emit_channel_pending_event() {
-			$locked_events.push(events::Event::ChannelPending {
+			$locked_events.push_back((events::Event::ChannelPending {
 				channel_id: $channel.channel_id(),
 				former_temporary_channel_id: $channel.temporary_channel_id(),
 				counterparty_node_id: $channel.get_counterparty_node_id(),
 				user_channel_id: $channel.get_user_id(),
 				funding_txo: $channel.get_funding_txo().unwrap().into_bitcoin_outpoint(),
-			});
+			}, None));
 			$channel.set_channel_pending_event_emitted();
 		}
 	}