X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannel.rs;h=7883d7b29e4806643c16513fcfc3aa751fffd709;hb=8b9cf93b11c49ab8726d807a72c083367dda356e;hp=11995c50d7fa0e1314fe3edcfadaca4993b7ec10;hpb=ad819ea70572b4775691e3fc386a788ff9438975;p=rust-lightning

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index 11995c50..7883d7b2 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -1903,6 +1903,15 @@ impl<Signer: Sign> Channel<Signer> {
 		Ok(())
 	}
 
+	/// Returns transaction if there is pending funding transaction that is yet to broadcast
+	pub fn unbroadcasted_funding(&self) -> Option<Transaction> {
+		 if self.channel_state & (ChannelState::FundingCreated as u32) != 0 {
+			 self.funding_transaction.clone()
+		 } else {
+			 None
+		 }
+	}
+
 	/// Returns a HTLCStats about inbound pending htlcs
 	fn get_inbound_pending_htlc_stats(&self) -> HTLCStats {
 		let mut stats = HTLCStats {
@@ -5516,7 +5525,7 @@ mod tests {
 	use bitcoin::hashes::hex::FromHex;
 	use hex;
 	use ln::{PaymentPreimage, PaymentHash};
-	use ln::channelmanager::{HTLCSource, MppId};
+	use ln::channelmanager::{HTLCSource, PaymentId};
 	use ln::channel::{Channel,InboundHTLCOutput,OutboundHTLCOutput,InboundHTLCState,OutboundHTLCState,HTLCOutputInCommitment,HTLCCandidate,HTLCInitiator,TxCreationKeys};
 	use ln::channel::MAX_FUNDING_SATOSHIS;
 	use ln::features::InitFeatures;
@@ -5690,7 +5699,7 @@ mod tests {
 				path: Vec::new(),
 				session_priv: SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap(),
 				first_hop_htlc_msat: 548,
-				mpp_id: MppId([42; 32]),
+				payment_id: PaymentId([42; 32]),
 			}
 		});