Refactor to collect only funding transaction in event from channel

Author: 1nF0rmed

lightning/src/ln/channel.rs

@@ -1306,6 +1306,10 @@ impl<Signer: Sign> Channel<Signer> {
 		self.channel_transaction_parameters.funding_outpoint.unwrap()
 	}
 
+	pub(crate)  fn funding_transaction(&self) -> Option<Transaction> {
+		self.funding_transaction.clone()
+	}
+
 	#[inline]
 	/// Creates a set of keys for build_commitment_transaction to generate a transaction which our
 	/// counterparty will sign (ie DO NOT send signatures over a transaction created by this to

lightning/src/ln/channelmanager.rs

@@ -1330,7 +1330,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 	fn issue_channel_close_events(&self, channel: &Channel<Signer>, closure_reason: ClosureReason) {
 		let mut pending_events_lock = self.pending_events.lock().unwrap();
 		if channel.is_funding_pending() {
-			pending_events_lock.push(events::Event::DiscardFunding { channel_id: channel.channel_id(), transaction: channel.channel_transaction_parameters.funding_outpoint});
+			pending_events_lock.push(events::Event::DiscardFunding { channel_id: channel.channel_id(), transaction: channel.funding_transaction() });
 		}
 		pending_events_lock.push(events::Event::ChannelClosed { channel_id: channel.channel_id(), reason: closure_reason });
 	}

lightning/src/util/events.rs

@@ -15,7 +15,6 @@
 //! few other things.
 
 use chain::keysinterface::SpendableOutputDescriptor;
-use chain::transaction::OutPoint;
 use ln::msgs;
 use ln::msgs::DecodeError;
 use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
@@ -31,6 +30,7 @@ use io;
 use prelude::*;
 use core::time::Duration;
 use core::ops::Deref;
+use bitcoin::Transaction;
 
 /// Some information provided on receipt of payment depends on whether the payment received is a
 /// spontaneous payment or a "conventional" lightning payment that's paying an invoice.
@@ -262,7 +262,7 @@ pub enum Event {
 		/// The channel_id of the channel which has been closed.
 		channel_id: [u8; 32],
 		/// The full transaction received from the user
-		transaction: Option<OutPoint>
+		transaction: Option<Transaction>
 	}
 }