Add channel_reestablish + peer_connected events to channel handler

[rust-lightning] / src / util / events.rs

diff --git a/src/util/events.rs b/src/util/events.rs
index c2c3ab6a1a71c0ce813dce3eb500e5a94fe53977..0dee714d22d8efc5eb58e911352e1839148468e1 100644 (file)
--- 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 {
@@ -104,6 +91,13 @@ pub enum Event {
        BroadcastChannelUpdate {
                msg: msgs::ChannelUpdate,
        },
+
+       //Error handling
+       /// Broadcast an error downstream to be handled
+       HandleError {
+               node_id: PublicKey,
+               action: Option<msgs::ErrorAction>
+       }
 }
 
 pub trait EventsProvider {