Clean up excess \ns in route debug, use all debug encoders

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

diff --git a/src/util/events.rs b/src/util/events.rs
index b090fba40e499cf4250ff4b9a47a24edc3a9219d..589c4be10e61b331e6443ef4514a66e6d754af80 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 {
@@ -89,6 +89,11 @@ pub enum Event {
                msg: msgs::UpdateFailHTLC,
                commitment_msg: msgs::CommitmentSigned,
        },
+       /// Used to indicate that a shutdown message should be sent to the peer with the given node_id.
+       SendShutdown {
+               node_id: PublicKey,
+               msg: msgs::Shutdown,
+       },
        /// Used to indicate that a channel_announcement and channel_update should be broadcast to all
        /// peers (except the peer with node_id either msg.contents.node_id_1 or msg.contents.node_id_2).
        BroadcastChannelAnnouncement {
@@ -99,6 +104,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 {