Merge pull request #163 from ariard/claim_revoked_htlc_tx

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

diff --git a/src/util/events.rs b/src/util/events.rs
index e8330b7e29ba9877449bda22641f6faa726c737b..0dee714d22d8efc5eb58e911352e1839148468e1 100644 (file)
--- 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 {
@@ -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>
        }
 }