X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Futil%2Fevents.rs;h=0dee714d22d8efc5eb58e911352e1839148468e1;hb=d7ed4c63e7ac0ef94189e318300edc456d472e86;hp=fd801e4111ed6f3c6b58dcea72f0c7ff1534b116;hpb=20fa9d331d4fadb766199011eac3aef852531809;p=rust-lightning

diff --git a/src/util/events.rs b/src/util/events.rs
index fd801e41..0dee714d 100644
--- a/src/util/events.rs
+++ b/src/util/events.rs
@@ -46,13 +46,13 @@ pub enum Event {
 	PaymentFailed {
 		payment_hash: [u8; 32],
 	},
-
-	// Events indicating the network loop should send a message to a peer:
 	/// Used to indicate that ChannelManager::process_pending_htlc_forwards should be called at a
 	/// time in the future.
 	PendingHTLCsForwardable {
 		time_forwardable: Instant,
 	},
+
+	// Events indicating the network loop should send a message to a peer:
 	/// Used to indicate that we've initialted a channel open and should send the open_channel
 	/// message provided to the given peer
 	SendOpenChannel {
@@ -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 {
-		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 {
+	UpdateHTLCs {
 		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 {
@@ -105,11 +92,11 @@ pub enum Event {
 		msg: msgs::ChannelUpdate,
 	},
 
-	// Events indicating the network loop should change the state of connection with peer:
-	/// Disconnect the given peer, possibly making an attempt to send an ErrorMessage first.
-	DisconnectPeer  {
+	//Error handling
+	/// Broadcast an error downstream to be handled
+	HandleError {
 		node_id: PublicKey,
-		msg: Option<msgs::ErrorMessage>,
+		action: Option<msgs::ErrorAction>
 	}
 }