X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fevents.rs;h=8b8cc1230372821aa52c0cd4e6edbdc01cb5f1bd;hb=3f2efcdfa73ee703093107f908cc7eeb0aa467e8;hp=118503c040d09fafc6d6783a7f5b1edfe839430b;hpb=0ac839d8cd6362cc034a5e431d525dea28a75c2c;p=rust-lightning

diff --git a/lightning/src/util/events.rs b/lightning/src/util/events.rs
index 118503c0..8b8cc123 100644
--- a/lightning/src/util/events.rs
+++ b/lightning/src/util/events.rs
@@ -16,7 +16,6 @@
 
 use ln::msgs;
 use ln::channelmanager::{PaymentPreimage, PaymentHash, PaymentSecret};
-use chain::transaction::OutPoint;
 use chain::keysinterface::SpendableOutputDescriptor;
 use util::ser::{Writeable, Writer, MaybeReadable, Readable};
 
@@ -49,16 +48,6 @@ pub enum Event {
 		/// The value passed in to ChannelManager::create_channel
 		user_channel_id: u64,
 	},
-	/// Used to indicate that the client may now broadcast the funding transaction it created for a
-	/// channel. Broadcasting such a transaction prior to this event may lead to our counterparty
-	/// trivially stealing all funds in the funding transaction!
-	FundingBroadcastSafe {
-		/// The output, which was passed to ChannelManager::funding_transaction_generated, which is
-		/// now safe to broadcast.
-		funding_txo: OutPoint,
-		/// The value passed in to ChannelManager::create_channel
-		user_channel_id: u64,
-	},
 	/// Indicates we've received money! Just gotta dig out that payment preimage and feed it to
 	/// ChannelManager::claim_funds to get it....
 	/// Note that if the preimage is not known or the amount paid is incorrect, you should call
@@ -140,19 +129,14 @@ impl Writeable for Event {
 				// We never write out FundingGenerationReady events as, upon disconnection, peers
 				// drop any channels which have not yet exchanged funding_signed.
 			},
-			&Event::FundingBroadcastSafe { ref funding_txo, ref user_channel_id } => {
-				1u8.write(writer)?;
-				funding_txo.write(writer)?;
-				user_channel_id.write(writer)?;
-			},
 			&Event::PaymentReceived { ref payment_hash, ref payment_secret, ref amt } => {
-				2u8.write(writer)?;
+				1u8.write(writer)?;
 				payment_hash.write(writer)?;
 				payment_secret.write(writer)?;
 				amt.write(writer)?;
 			},
 			&Event::PaymentSent { ref payment_preimage } => {
-				3u8.write(writer)?;
+				2u8.write(writer)?;
 				payment_preimage.write(writer)?;
 			},
 			&Event::PaymentFailed { ref payment_hash, ref rejected_by_dest,
@@ -161,7 +145,7 @@ impl Writeable for Event {
 				#[cfg(test)]
 				ref error_data,
 			} => {
-				4u8.write(writer)?;
+				3u8.write(writer)?;
 				payment_hash.write(writer)?;
 				rejected_by_dest.write(writer)?;
 				#[cfg(test)]
@@ -170,12 +154,12 @@ impl Writeable for Event {
 				error_data.write(writer)?;
 			},
 			&Event::PendingHTLCsForwardable { time_forwardable: _ } => {
-				5u8.write(writer)?;
+				4u8.write(writer)?;
 				// We don't write the time_fordwardable out at all, as we presume when the user
 				// deserializes us at least that much time has elapsed.
 			},
 			&Event::SpendableOutputs { ref outputs } => {
-				6u8.write(writer)?;
+				5u8.write(writer)?;
 				(outputs.len() as u64).write(writer)?;
 				for output in outputs.iter() {
 					output.write(writer)?;
@@ -189,19 +173,15 @@ impl MaybeReadable for Event {
 	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Option<Self>, msgs::DecodeError> {
 		match Readable::read(reader)? {
 			0u8 => Ok(None),
-			1u8 => Ok(Some(Event::FundingBroadcastSafe {
-					funding_txo: Readable::read(reader)?,
-					user_channel_id: Readable::read(reader)?,
-				})),
-			2u8 => Ok(Some(Event::PaymentReceived {
+			1u8 => Ok(Some(Event::PaymentReceived {
 					payment_hash: Readable::read(reader)?,
 					payment_secret: Readable::read(reader)?,
 					amt: Readable::read(reader)?,
 				})),
-			3u8 => Ok(Some(Event::PaymentSent {
+			2u8 => Ok(Some(Event::PaymentSent {
 					payment_preimage: Readable::read(reader)?,
 				})),
-			4u8 => Ok(Some(Event::PaymentFailed {
+			3u8 => Ok(Some(Event::PaymentFailed {
 					payment_hash: Readable::read(reader)?,
 					rejected_by_dest: Readable::read(reader)?,
 					#[cfg(test)]
@@ -209,10 +189,10 @@ impl MaybeReadable for Event {
 					#[cfg(test)]
 					error_data: Readable::read(reader)?,
 				})),
-			5u8 => Ok(Some(Event::PendingHTLCsForwardable {
+			4u8 => Ok(Some(Event::PendingHTLCsForwardable {
 					time_forwardable: Duration::from_secs(0)
 				})),
-			6u8 => {
+			5u8 => {
 				let outputs_len: u64 = Readable::read(reader)?;
 				let mut outputs = Vec::new();
 				for _ in 0..outputs_len {