X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Futil%2Fevents.rs;h=0dee714d22d8efc5eb58e911352e1839148468e1;hb=12a50627a331c24af0d56389800020046c380dde;hp=589c4be10e61b331e6443ef4514a66e6d754af80;hpb=587f2b39fc30400ecadcb4145eeac4c896d5f51c;p=rust-lightning

diff --git a/src/util/events.rs b/src/util/events.rs
index 589c4be1..0dee714d 100644
--- a/src/util/events.rs
+++ b/src/util/events.rs
@@ -70,24 +70,11 @@ pub enum Event {
 		msg: msgs::FundingLocked,
 		announcement_sigs: Option<msgs::AnnouncementSignatures>,
 	},
-	/// Used to indicate that a series of update_add_htlc messages, as well as a commitment_signed
+	/// Used to indicate that a series of HTLC update messages, as well as a commitment_signed
 	/// message should be sent to the peer with the given node_id.
-	SendHTLCs {
+	UpdateHTLCs {
 		node_id: PublicKey,
-		msgs: Vec<msgs::UpdateAddHTLC>,
-		commitment_msg: msgs::CommitmentSigned,
-	},
-	/// Used to indicate that we're ready to fulfill an htlc from the peer with the given node_id.
-	SendFulfillHTLC {
-		node_id: PublicKey,
-		msg: msgs::UpdateFulfillHTLC,
-		commitment_msg: msgs::CommitmentSigned,
-	},
-	/// Used to indicate that we need to fail an htlc from the peer with the given node_id.
-	SendFailHTLC {
-		node_id: PublicKey,
-		msg: msgs::UpdateFailHTLC,
-		commitment_msg: msgs::CommitmentSigned,
+		updates: msgs::CommitmentUpdate,
 	},
 	/// Used to indicate that a shutdown message should be sent to the peer with the given node_id.
 	SendShutdown {