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 fd801e4111ed6f3c6b58dcea72f0c7ff1534b116..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 {
@@ -105,11 +105,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>
        }
 }